Attachment #6120 for issue #14318

View | Details | Raw Unified | Return to issue 14318
Collapse All | Expand All




SHL1STDLIBS += \
		uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \
		winmm.lib
.ENDIF # "$(GUI)"=="WNT"

DEF1NAME    =$(SHL1TARGET)
DEF1DEPN    =$(MISC)$/$(SHL1TARGET).flt

	setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
	setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)
.ELSE # "$(GUI)" != "WNT"
.IF "$(USE_SHELL)" != "4nt"
DOLLAR_SIGN=\$$
REGCOMP_ENV=\
	setenv CLASSPATH "$(strip $(subst,\,/ $(shell guw.pl echo $(REGCOMP_CLASSPATH))))" && \
	setenv PATH "$(PATH):$(JREPATH)"
MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(shell guw.pl echo $(SOLARBINDIR))))
.ELSE # "$(USE_SHELL)" != "4nt"
DOLLAR_SIGN=$$
REGCOMP_ENV=\
	set CLASSPATH=$(REGCOMP_CLASSPATH) && \
	set PATH=$(PATH);$(JREPATH)
MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(SOLARBINDIR)))
.ENDIF  # "$(USE_SHELL)" != "4nt"
.ENDIF  # "$(GUI)"!="WNT"
.ENDIF  # "$(JAVANUMVER)" >= "000100040000"
.ENDIF  # "$(SOLAR_JAVA)" != ""

		$(foreach,i,$(REGISTERLIBS_JAVA) $(MY_DLLDIR)$/$(i))
	-rm -f $@ $(BIN)$/regcomp.rdb $(BIN)$/setup_services.tmp
# register the native libraries
	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS))"
.IF "$(SOLAR_JAVA)" != ""
.IF "$(JAVANUMVER)" >= "000100040000"
	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS_JAVA))"
# prepare a registry which regcomp can work on (types+java services)
	$(REGCOMP) -register -r $(BIN)$/regcomp.rdb -c "$(strip $(REGISTERLIBS_JAVA))"
	$(REGMERGE) $(BIN)$/regcomp.rdb / $(SOLARBINDIR)/udkapi.rdb
# now do the registration
	+$(REGCOMP_ENV) && \
		$(REGCOMP) -br $(BIN)$/regcomp.rdb 			\
			-register					\
			-r $(BIN)$/setup_services.tmp 		\
			-l com.sun.star.loader.Java2			\

		$(foreach,i,$(REGISTERLIBS) $(MY_DLLDIR)$/$(i))
	-$(MKDIRHIER) $(BIN)/remote
	-rm -f $@
	$(REGCOMP) -register -r $@ -c "$(strip $(REGISTERLIBS))"

Return to issue 14318

Lines 153-159 Link Here

(-)setup2/util/makefile.mk (-7 / +15 lines)
153	SHL1STDLIBS += \	153	SHL1STDLIBS += \
154	uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \	154	uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \
155	winmm.lib	155	winmm.lib
156	.ENDIF # "$(GUI)"=="UNX"	156	.ENDIF # "$(GUI)"=="WNT"
157		157
158	DEF1NAME =$(SHL1TARGET)	158	DEF1NAME =$(SHL1TARGET)
159	DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt	159	DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt
Lines 360-370 Link Here
360	setenv CLASSPATH $(REGCOMP_CLASSPATH) && \	360	setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
361	setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)	361	setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)
362	.ELSE # "$(GUI)" != "WNT"	362	.ELSE # "$(GUI)" != "WNT"
		363	.IF "$(USE_SHELL)" != "4nt"
		364	DOLLAR_SIGN=\$$
		365	REGCOMP_ENV=\
		366	setenv CLASSPATH "$(strip $(subst,\,/ $(shell guw.pl echo $(REGCOMP_CLASSPATH))))" && \
		367	setenv PATH "$(PATH):$(JREPATH)"
		368	MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(shell guw.pl echo $(SOLARBINDIR))))
		369	.ELSE # "$(USE_SHELL)" != "4nt"
363	DOLLAR_SIGN=$$	370	DOLLAR_SIGN=$$
364	REGCOMP_ENV=\	371	REGCOMP_ENV=\
365	set CLASSPATH=$(REGCOMP_CLASSPATH) && \	372	set CLASSPATH=$(REGCOMP_CLASSPATH) && \
366	set PATH=$(PATH);$(JREPATH)	373	set PATH=$(PATH);$(JREPATH)
367	MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(SOLARBINDIR)))	374	MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(SOLARBINDIR)))
		375	.ENDIF # "$(USE_SHELL)" != "4nt"
368	.ENDIF # "$(GUI)"!="WNT"	376	.ENDIF # "$(GUI)"!="WNT"
369	.ENDIF # "$(JAVANUMVER)" >= "000100040000"	377	.ENDIF # "$(JAVANUMVER)" >= "000100040000"
370	.ENDIF # "$(SOLAR_JAVA)" != ""	378	.ENDIF # "$(SOLAR_JAVA)" != ""
Lines 375-390 Link Here
375	$(foreach,i,$(REGISTERLIBS_JAVA) $(MY_DLLDIR)$/$(i))	383	$(foreach,i,$(REGISTERLIBS_JAVA) $(MY_DLLDIR)$/$(i))
376	-rm -f $@ $(BIN)$/regcomp.rdb $(BIN)$/setup_services.tmp	384	-rm -f $@ $(BIN)$/regcomp.rdb $(BIN)$/setup_services.tmp
377	# register the native libraries	385	# register the native libraries
378	regcomp -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS))"	386	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS))"
379	.IF "$(SOLAR_JAVA)" != ""	387	.IF "$(SOLAR_JAVA)" != ""
380	.IF "$(JAVANUMVER)" >= "000100040000"	388	.IF "$(JAVANUMVER)" >= "000100040000"
381	regcomp -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS_JAVA))"	389	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS_JAVA))"
382	# prepare a registry which regcomp can work on (types+java services)	390	# prepare a registry which regcomp can work on (types+java services)
383	regcomp -register -r $(BIN)$/regcomp.rdb -c "$(strip $(REGISTERLIBS_JAVA))"	391	$(REGCOMP) -register -r $(BIN)$/regcomp.rdb -c "$(strip $(REGISTERLIBS_JAVA))"
384	regmerge $(BIN)$/regcomp.rdb / $(SOLARBINDIR)/udkapi.rdb	392	$(REGMERGE) $(BIN)$/regcomp.rdb / $(SOLARBINDIR)/udkapi.rdb
385	# now do the registration	393	# now do the registration
386	+$(REGCOMP_ENV) && \	394	+$(REGCOMP_ENV) && \
387	regcomp -br $(BIN)$/regcomp.rdb \	395	$(REGCOMP) -br $(BIN)$/regcomp.rdb \
388	-register \	396	-register \
389	-r $(BIN)$/setup_services.tmp \	397	-r $(BIN)$/setup_services.tmp \
390	-l com.sun.star.loader.Java2 \	398	-l com.sun.star.loader.Java2 \
Lines 402-405 Link Here
402	$(foreach,i,$(REGISTERLIBS) $(MY_DLLDIR)$/$(i))	410	$(foreach,i,$(REGISTERLIBS) $(MY_DLLDIR)$/$(i))
403	-$(MKDIRHIER) $(BIN)/remote	411	-$(MKDIRHIER) $(BIN)/remote
404	-rm -f $@	412	-rm -f $@
405	regcomp -register -r $@ -c "$(strip $(REGISTERLIBS))"	413	$(REGCOMP) -register -r $@ -c "$(strip $(REGISTERLIBS))"