summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-11-10 11:15:48 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-11-10 11:15:48 +0100
commit6cad56c32a1464fea3dffd63600c79f8ee00627e (patch)
tree23124709a630584eb9fd11b1c705c6b8b3ca1cf3 /solenv
parente49725438d34df305e7a4730c72034144994306d (diff)
avoid exceeding commandline limits
by using make's file function via the var2file wrapper instead of using loooooong echo statements Change-Id: Ie81007ad7de8c4e9f4d07724fba3cbe0e93f821d
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/AllLangResTarget.mk3
-rw-r--r--solenv/gbuild/Configuration.mk3
-rw-r--r--solenv/gbuild/CustomTarget.mk3
-rw-r--r--solenv/gbuild/Extension.mk3
-rw-r--r--solenv/gbuild/UIConfig.mk3
5 files changed, 5 insertions, 10 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 4289db1d6687..ef10ec530c0e 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -42,8 +42,7 @@ gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependenci
gb_SrsPartMergeTarget_TRANSEXCOMMAND = $(call gb_Executable_get_command,transex3)
define gb_SrsPartMergeTarget__command
-MERGEINPUT=`$(gb_MKTEMP)` && \
-echo $(POFILES) > $${MERGEINPUT} && \
+MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index e5b8a9a4e812..8d3b949e31d9 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -211,8 +211,7 @@ gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
define gb_XcuMergeTarget__command
$(call gb_Output_announce,$(2),$(true),XCX,1)
-MERGEINPUT=`$(gb_MKTEMP)` && \
-echo $(POFILES) > $${MERGEINPUT} && \
+MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_XcuMergeTarget_CFGEXCOMMAND) \
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index e2dc2fdf622a..f68d7da18ecf 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -55,8 +55,7 @@ ifneq ($(WITH_LANG),)
# $(call gb_CustomTarget_ulfex__command,ulftarget,ulfsource,pofiles)
define gb_CustomTarget_ulfex__command
$(call gb_Output_announce,$(1),$(true),ULF,1)
-MERGEINPUT=`$(gb_MKTEMP)` && \
-echo $(3) > $${MERGEINPUT} && \
+MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(3)) && \
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -i $(2) -o $(1) -m $${MERGEINPUT} -l all) && \
rm -rf $${MERGEINPUT}
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index ee3841f9a9fc..fc6e6b7efd64 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -79,8 +79,7 @@ $(call gb_Extension_get_workdir,%)/description.xml :
else
$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
- MERGEINPUT=`$(gb_MKTEMP)` && \
- echo $(POFILES) > $${MERGEINPUT} && \
+ MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_Extension_get_workdir,$*) && \
$(gb_Extension_XRMEXCOMMAND) \
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 84f2609a21f2..7746a5de7b65 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -28,8 +28,7 @@ $(call gb_UILocalizeTarget_get_workdir,%).ui :
define gb_UILocalizeTarget__command
$(call gb_Output_announce,$(2),$(true),UIX,1)
-MERGEINPUT=`$(gb_MKTEMP)` && \
-echo $(POFILES) > $${MERGEINPUT} && \
+MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
$(call gb_Helper_abbreviate_dirs,\
$(gb_UILocalizeTarget_COMMAND) \
-i $(UIConfig_FILE) \