mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use $(value ...) to reduce escalating double-quoting of dollars

Browse Source 
Change-Id: I92b4c1be5d8e051a4d716900bcc5dd7bb621017b
Reviewed-on: https://gerrit.libreoffice.org/8658
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Bjoern Michaelsen
2014-03-19 13:46:36 +01:00
committed by Björn Michaelsen
parent 3e92847d75
commit d2c16eb81a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
solenv/gbuild/JunitTest.mk
View File

@@ -41,7 +41,7 @@ $(call gb_JunitTest_get_target,%) :
(DBGSV_ERROR_OUT=shell DISABLE_SAL_DBGBOX=t \ (DBGSV_ERROR_OUT=shell DISABLE_SAL_DBGBOX=t \
$(gb_JunitTest_JAVACOMMAND) \ $(gb_JunitTest_JAVACOMMAND) \
-classpath "$(T_CP)" \ -classpath "$(T_CP)" \
$(DEFS) \ $(value DEFS) \
org.junit.runner.JUnitCore \ org.junit.runner.JUnitCore \
$(CLASSES) > $@.log 2>&1 || \ $(CLASSES) > $@.log 2>&1 || \
(cat $@.log \ (cat $@.log \

4
solenv/gbuild/platform/com_MSC_class.mk
View File

@@ -401,8 +401,8 @@ endif
define gb_JunitTest_JunitTest_platform define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}" \ -Dorg.openoffice.test.arg.soffice="$${OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH="$$$$PATH" \ -Dorg.openoffice.test.arg.env=PATH="$$PATH" \
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1)))
endef endef

2
solenv/gbuild/platform/macosx.mk
View File

@@ -299,7 +299,7 @@ endif
define gb_JunitTest_JunitTest_platform define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \ -Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH"$$$${DYLD_LIBRARY_PATH+=$$$$DYLD_LIBRARY_PATH}" \ -Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH"$${DYLD_LIBRARY_PATH+=$$DYLD_LIBRARY_PATH}" \
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \
-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \

2
solenv/gbuild/platform/solaris.mk
View File

@@ -321,7 +321,7 @@ endif
define gb_JunitTest_JunitTest_platform define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \
-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \
-Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh \ -Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh \

2
solenv/gbuild/platform/unxgcc.mk
View File

@@ -319,7 +319,7 @@ endif
define gb_JunitTest_JunitTest_platform define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \
-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \
-Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh \ -Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh \