bean/test/makefile.mk | 4 ++-- bridges/test/java_uno/acquire/makefile.mk | 10 +++++----- bridges/test/java_uno/any/makefile.mk | 10 +++++----- bridges/test/java_uno/equals/makefile.mk | 8 ++++---- bridges/test/java_uno/nativethreadpool/makefile.mk | 4 ++-- config_host.mk.in | 2 +- embeddedobj/test/Container1/makefile.mk | 8 ++++---- extensions/qa/integration/extensions/makefile.mk | 2 +- jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk | 2 +- libmwaw/ExternalProject_libmwaw.mk | 1 - libodfgen/ExternalProject_libodfgen.mk | 1 - libvisio/ExternalProject_libvisio.mk | 1 - libwpg/ExternalProject_libwpg.mk | 1 - libwps/ExternalProject_libwps.mk | 1 - 14 files changed, 25 insertions(+), 30 deletions(-)
New commits: commit e78d3245487e9b140caa15b586374e413eba178a Author: Tor Lillqvist <[email protected]> Date: Wed May 15 13:38:52 2013 +0300 Revert changes that are now unnecessary and pointless This reverts commit a94dc2203539a1593b99778be16b2c664fd46daa. This reverts commit 3baa1c8c9baf6bb35f9d2ff5e002a5403d2d4af4. This reverts commit 4e312f0c90247ccaa138520aa9e080453ec90b64. This reverts commit 050a51b69e89e230e157be52d8b23862f3c06ba8. This reverts commit 9c2a1cb4351c8f80a27b7ba413ad382368387425. diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk index 3a0a8f0..82b4a3d 100644 --- a/libmwaw/ExternalProject_libmwaw.mk +++ b/libmwaw/ExternalProject_libmwaw.mk @@ -32,7 +32,6 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : --disable-werror \ CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk index 3c9d479..3b0ce21 100644 --- a/libodfgen/ExternalProject_libodfgen.mk +++ b/libodfgen/ExternalProject_libodfgen.mk @@ -33,7 +33,6 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : --disable-weffc \ CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \ ) diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 66c6a919..3a5ce50 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -41,7 +41,6 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe AWK=awk.exe SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk index 5c858cb..226474c 100644 --- a/libwpg/ExternalProject_libwpg.mk +++ b/libwpg/ExternalProject_libwpg.mk @@ -30,7 +30,6 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : --disable-debug \ --disable-werror \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk index 7b586c0..ba1bdb0 100644 --- a/libwps/ExternalProject_libwps.mk +++ b/libwps/ExternalProject_libwps.mk @@ -32,7 +32,6 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : --disable-werror \ CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) commit 07976ee1de03ab558fd1fe6f921514c8250cee02 Author: Tor Lillqvist <[email protected]> Date: Wed May 15 13:30:11 2013 +0300 Don't export a variable called PATH_SEPARATOR It used to be mis-spelled PATH_SEPERATOR. Now, after correcting the spelling, it breaks the build of 3rd-party libraries using autoconfigury on Windows. The value of PATH_SEPARATOR is ";" on Windows, and the configure scripts of those libs run in Cygwin and assume that a PATH_SEPARATOR environment variable should be correct for Cygwin. Which ";" isn't. Rename the variable to LIBO_PATH_SEPARATOR. Change-Id: Iff0eb93bf11d9f844a28be7ea4456e4c0ae10844 diff --git a/bean/test/makefile.mk b/bean/test/makefile.mk index 1e3c493..f48ab8f 100644 --- a/bean/test/makefile.mk +++ b/bean/test/makefile.mk @@ -33,8 +33,8 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) MAXLINELENGTH = 100000 -OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPARATOR)) -OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(PATH_SEPARATOR)$(CLASSDIR) +OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(LIBO_PATH_SEPARATOR)) +OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(LIBO_PATH_SEPARATOR)$(CLASSDIR) OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=--norestore diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk index 8373710..e38f9e8 100644 --- a/bridges/test/java_uno/acquire/makefile.mk +++ b/bridges/test/java_uno/acquire/makefile.mk @@ -56,7 +56,7 @@ GIVE_EXEC_RIGHTS = chmod +x EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i) EXEC_CLASSPATH = \ - $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) + $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) $(BIN)$/$(TARGET).rdb: types.idl - rm $@ @@ -79,16 +79,16 @@ TEST_JAVAUNO_ACQUIRE_UNO_URL := \ $(BIN)$/testacquire-java-client: echo java -classpath \ - ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\ -..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\ +..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ test.javauno.acquire.TestAcquire client \ $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@ $(GIVE_EXEC_RIGHTS) $@ $(BIN)$/testacquire-java-server: echo java -classpath \ - ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\ -..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\ +..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ test.javauno.acquire.TestAcquire server \ $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@ $(GIVE_EXEC_RIGHTS) $@ diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk index e997540..b942e54 100644 --- a/bridges/test/java_uno/any/makefile.mk +++ b/bridges/test/java_uno/any/makefile.mk @@ -39,13 +39,13 @@ JAVAFILES = \ .IF "$(XCLASSPATH)" == "" XCLASSPATH := $(CLASSDIR)$/test .ELSE -XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)$/test +XCLASSPATH !:= $(XCLASSPATH)$(LIBO_PATH_SEPARATOR)$(CLASSDIR)$/test .ENDIF EXEC_CLASSPATH_TMP = \ - $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPARATOR)$(XCLASSPATH) + $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(LIBO_PATH_SEPARATOR)$(XCLASSPATH) EXEC_CLASSPATH = \ - $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) + $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) JARFILES = juh.jar jurt.jar ridl.jar JAVACLASSFILES = \ @@ -96,14 +96,14 @@ ALLTAR : \ $(OUT)$/bin$/TestRemote : $(JAVACLASSFILES) -rm -f $@ - echo java -classpath ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + echo java -classpath ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ test.java_uno.anytest.TestRemote > $@ $(GIVE_EXEC_RIGHTS) $@ $(OUT)$/bin$/TestJni : $(JAVACLASSFILES) -rm -f $@ echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \ - .$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + .$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ -Djava.library.path=..$/lib test.java_uno.anytest.TestJni >> $@ $(GIVE_EXEC_RIGHTS) $@ diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk index ae700d4..e6affc8 100644 --- a/bridges/test/java_uno/equals/makefile.mk +++ b/bridges/test/java_uno/equals/makefile.mk @@ -30,7 +30,7 @@ ENABLE_EXCEPTIONS = TRUE .IF "$(XCLASSPATH)" == "" XCLASSPATH := $(CLASSDIR)$/test .ELSE -XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)$/test +XCLASSPATH !:= $(XCLASSPATH)$(LIBO_PATH_SEPARATOR)$(CLASSDIR)$/test .ENDIF DLLPRE = # no leading "lib" on .so files @@ -59,7 +59,7 @@ GIVE_EXEC_RIGHTS = chmod +x EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i) EXEC_CLASSPATH = \ - $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) + $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) $(MISC)$/$(TARGET).rdb: types.idl - rm $@ @@ -74,8 +74,8 @@ $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb $(BIN)$/testequals: $(BIN)$/testequals_services.rdb echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \ - ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\ -..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\ +..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ test.java_uno.equals.TestEquals $(SOLARBINDIR)$/types.rdb \ testequals_services.rdb > $@ $(GIVE_EXEC_RIGHTS) $@ diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk index dc48562..504bcb1 100644 --- a/bridges/test/java_uno/nativethreadpool/makefile.mk +++ b/bridges/test/java_uno/nativethreadpool/makefile.mk @@ -59,7 +59,7 @@ ALLTAR: test EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i) EXEC_CLASSPATH = \ - $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) + $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) $(MISC)$/$(TARGET)$/types.rdb: types.idl - rm $@ @@ -105,7 +105,7 @@ test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb -l $(SHL2TARGETN) -ro $(BIN)$/$(TARGET).rdb \ -u 'uno:socket,host=localhost,port=3830;urp;test' --singleaccept & + $(AUGMENT_LIBRARY_PATH) OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' \ - CLASSPATH=$(EXEC_CLASSPATH)$(PATH_SEPARATOR)$(BIN)$/$(TARGET).uno.jar \ + CLASSPATH=$(EXEC_CLASSPATH)$(LIBO_PATH_SEPARATOR)$(BIN)$/$(TARGET).uno.jar \ uno -c test.javauno.nativethreadpool.client -l $(SHL1TARGETN) \ -ro $(BIN)$/$(TARGET).rdb \ -env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR) diff --git a/config_host.mk.in b/config_host.mk.in index 2c5167d..7f755cd 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -386,7 +386,7 @@ export OUTDIR=@OUTDIR@ export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@ export OUTPATH=@OUTPATH@ export PATH=@LO_PATH@ -export PATH_SEPARATOR=@P_SEP@ +export LIBO_PATH_SEPARATOR=@P_SEP@ export PERL=@PERL@ export PKGFORMAT=@PKGFORMAT@ export PKGMK=@PKGMK@ diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk index fed9034..f2523ca 100644 --- a/embeddedobj/test/Container1/makefile.mk +++ b/embeddedobj/test/Container1/makefile.mk @@ -25,9 +25,9 @@ PACKAGE = embeddedobj$/test .INCLUDE: settings.mk # EXEC_CLASSPATH_TMP = \ -# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPARATOR) +# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(LIBO_PATH_SEPARATOR) # EXEC_CLASSPATH = \ -# $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) +# $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) #----- compile .java files ----------------------------------------- @@ -66,11 +66,11 @@ JavaStorageTestExample : $(CLASSFILES) # echo $(EXEC_CLASSPATH) run: $(CLASSFILES) - +set PATH=$(PATH)$(PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \ + +set PATH=$(PATH)$(LIBO_PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \ java -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(JDK14PATH)$/jre$/bin;$(JDK14PATH)$/jre$/lib;$(CLASSPATH)" embeddedobj.test.EmbedContFrame debug: $(CLASSFILES) - +set PATH=$(PATH)$(PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \ + +set PATH=$(PATH)$(LIBO_PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \ jdb -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(CLASSPATH)" embeddedobj.test.EmbedContFrame clean : diff --git a/extensions/qa/integration/extensions/makefile.mk b/extensions/qa/integration/extensions/makefile.mk index 6861d1b..ca524e0 100644 --- a/extensions/qa/integration/extensions/makefile.mk +++ b/extensions/qa/integration/extensions/makefile.mk @@ -53,7 +53,7 @@ JARCOMPRESS = TRUE .ENDIF # classpath and argument list -RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPARATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPARATOR)$(CLASSPATH)$(PATH_SEPARATOR)$(SOLARBINDIR)$/ConnectivityTools.jar +RUNNER_CLASSPATH = -cp $(CLASSPATH)$(LIBO_PATH_SEPARATOR)$(SOLARBINDIR)$/OOoRunner.jar$(LIBO_PATH_SEPARATOR)$(CLASSPATH)$(LIBO_PATH_SEPARATOR)$(SOLARBINDIR)$/ConnectivityTools.jar RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -cs $(RUNNER_CONNECTION_STRING) # --- Targets ------------------------------------------------------ diff --git a/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk b/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk index 2e59189..8bdbbd8 100644 --- a/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk +++ b/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk @@ -32,7 +32,7 @@ JARFILES := ridl.jar juh.jar .IF "$(XCLASSPATH)" == "" XCLASSPATH := $(CLASSDIR) .ELSE -XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR) +XCLASSPATH !:= $(XCLASSPATH)$(LIBO_PATH_SEPARATOR)$(CLASSDIR) .ENDIF CLASSDIR !:= $(CLASSDIR)$/workbench _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
