Kaydet (Commit) 111e10bd authored tarafından Michael Stahl's avatar Michael Stahl

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.

Change-Id: I213dba7155f9515e492c20cfff3bef1c4d8269fc
üst 5d95ab29
...@@ -117,7 +117,7 @@ endef ...@@ -117,7 +117,7 @@ endef
define gb_JavaClassSet_use_jar define gb_JavaClassSet_use_jar
$(call gb_JavaClassSet_get_target,$(1)) : $(2) $(call gb_JavaClassSet_get_target,$(1)) : $(2)
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)
$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(strip $(2)) $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2))
$(2) :| $(gb_Helper_PHONY) $(2) :| $(gb_Helper_PHONY)
endef endef
...@@ -129,7 +129,7 @@ $$(call gb_Output_error,\ ...@@ -129,7 +129,7 @@ $$(call gb_Output_error,\
endef endef
define gb_JavaClassSet_use_system_jar define gb_JavaClassSet_use_system_jar
$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(strip $(2)) $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2))
endef endef
...@@ -167,7 +167,7 @@ endef ...@@ -167,7 +167,7 @@ endef
define gb_JavaClassSet_use_jar_classset define gb_JavaClassSet_use_jar_classset
$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2))) $(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2)))
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2))) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2)))
$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2)))
endef endef
......
...@@ -65,7 +65,7 @@ $(call gb_JunitTest_get_target,%) : ...@@ -65,7 +65,7 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD) $(CLEAN_CMD)
define gb_JunitTest_JunitTest define gb_JunitTest_JunitTest
$(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$(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 := $(if $(value XCLASSPATH),$$(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 := $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
$(eval $(call gb_JunitTest_JunitTest_platform,$(1))) $(eval $(call gb_JunitTest_JunitTest_platform,$(1)))
...@@ -108,7 +108,7 @@ endef ...@@ -108,7 +108,7 @@ endef
define gb_JunitTest_use_jar define gb_JunitTest_use_jar
$(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) $(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
$(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) $(call gb_JunitTest_get_target,$(1)) : $(2)
$(2) :| $(gb_Helper_PHONY) $(2) :| $(gb_Helper_PHONY)
...@@ -132,7 +132,7 @@ endef ...@@ -132,7 +132,7 @@ endef
# see gb_JavaClassSet_use_jar_classset # see gb_JavaClassSet_use_jar_classset
define gb_JunitTest_use_jar_classset define gb_JunitTest_use_jar_classset
$(call gb_JavaClassSet_use_jar_classset,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) $(call gb_JavaClassSet_use_jar_classset,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2)))
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment