solenv/gbuild/JavaClassSet.mk | 4 ++-- solenv/gbuild/JunitTest.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit f64788427bac5f88936c134def6fed9cbec32c2c Author: Michael Stahl <[email protected]> Date: Thu Apr 4 12:02:23 2013 +0100 gbuild: un-break setting classpath on Windows: Apparently LO patched GNU make 3.82 interprets the semicolon which is the value of $(gb_CLASSPATHSEP) as a terminator if it occurs while setting a target local variable; the part of the value that follows the first semicolon is cut off. Hence escape the $(gb_CLASSPATHSEP) and $(XCLASSPATH) vars. (cherry picked from commit 0c2a0de598bd39839a610a7e53660bb67397466b) Signed-off-by: Michael Meeks <[email protected]> Change-Id: I213dba7155f9515e492c20cfff3bef1c4d8269fc diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 0fbb6b0..1ae9ad1 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -87,13 +87,13 @@ endef # build order dependency is a hack to get these prerequisites out of the way in the build command define gb_JavaClassSet_add_jar $(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2)) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(strip $(2))) $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) endef # this does not generate dependency on the jar define gb_JavaClassSet_add_system_jar -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(strip $(2))) $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 4499cba..5436b6e 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -69,7 +69,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(value XCLASSPATH)$$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(eval $(call gb_JunitTest_JunitTest_platform,$(1))) @@ -110,7 +110,7 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $(2) endef define gb_JunitTest_add_jar -$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(2) $(call gb_JunitTest_get_target,$(1)) : $(2) endef _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
