librelogo/CustomTarget_librelogo.mk | 2
officecfg/CustomTarget_registry.mk | 2
postprocess/CustomTarget_components.mk | 2
postprocess/CustomTarget_images.mk | 2
postprocess/CustomTarget_registry.mk | 2
solenv/gbuild/AutoInstall.mk | 10 ++--
solenv/gbuild/Configuration.mk | 2
solenv/gbuild/CustomTarget.mk | 2
solenv/gbuild/Dictionary.mk | 4 -
solenv/gbuild/Extension.mk | 4 -
solenv/gbuild/Gallery.mk | 2
solenv/gbuild/HelpTarget.mk | 10 ++--
solenv/gbuild/InstallScript.mk | 2
solenv/gbuild/JavaClassSet.mk | 4 -
solenv/gbuild/LinkTarget.mk | 8 +--
solenv/gbuild/Package.mk | 4 -
solenv/gbuild/PrecompiledHeaders.mk | 2
solenv/gbuild/Rdb.mk | 2
solenv/gbuild/Tempfile.mk | 2
solenv/gbuild/UnoApiTarget.mk | 2
solenv/gbuild/Zip.mk | 2
solenv/gbuild/extensions/post_GbuildToJson.mk | 60 +++++++++++++-------------
solenv/gbuild/platform/com_MSC_class.mk | 6 +-
solenv/gbuild/platform/macosx.mk | 2
static/CustomTarget_emscripten_fs_image.mk | 2
wizards/CustomTarget_wizards.mk | 2
26 files changed, 72 insertions(+), 72 deletions(-)
New commits:
commit f127fa685dfe4999a2aab24e7b26dca5ab9919fb
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat Dec 10 15:07:24 2022 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Dec 13 15:04:01 2022 +0000
gb_var2file: remove now unused chunk-size parameter
that parameter did specify how many entries of the list the workaround
method could use to not exceed commandline length limits, so it was a
guess of sorts and many places didn't actually bother with tweaking that
value anyway and just used 100. the $(file …) function doesn't care
about that, so the parameter was always ignored in that case.
Change-Id: If89ec3a1968be297c0fe7c65336c5a965598f0c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143911
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/librelogo/CustomTarget_librelogo.mk
b/librelogo/CustomTarget_librelogo.mk
index 023637885891..461743b25d39 100644
--- a/librelogo/CustomTarget_librelogo.mk
+++ b/librelogo/CustomTarget_librelogo.mk
@@ -39,7 +39,7 @@ $(librelogo_DIR)/LibreLogo_%.properties : \
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRP)
$(call gb_Helper_abbreviate_dirs, \
$(if $(filter-out qtz,$(LANGUAGE)), \
- MERGEINPUT=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(POFILE)) && \
+ MERGEINPUT=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(POFILE)) && \
$(call gb_Executable_get_command,propex) \
-i $(SOURCE) \
-o $@ \
diff --git a/officecfg/CustomTarget_registry.mk
b/officecfg/CustomTarget_registry.mk
index dd1efa6f22da..5c1048cd8521 100644
--- a/officecfg/CustomTarget_registry.mk
+++ b/officecfg/CustomTarget_registry.mk
@@ -24,7 +24,7 @@ $(call
gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_al
$(SRCDIR)/officecfg/files.mk
$(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1)
$(call gb_Trace_StartRange,officecfg_qa_allheaders.hxx,CAT)
- mv $(call gb_var2file,$(shell mkdir -p $(dir $@) && cat /dev/null
>$@.tmp && echo $@.tmp),100,$(foreach file,$(officecfg_XCSFILES),$(call
officecfg_geninclude,$(file)))) $@
+ mv $(call gb_var2file,$(shell mkdir -p $(dir $@) && cat /dev/null
>$@.tmp && echo $@.tmp),$(foreach file,$(officecfg_XCSFILES),$(call
officecfg_geninclude,$(file)))) $@
$(call gb_Trace_EndRange,officecfg_qa_allheaders.hxx,CAT)
# pass the stem as space separated path elements and get a set of
--stringparam ns<level> <element> in return
diff --git a/postprocess/CustomTarget_components.mk
b/postprocess/CustomTarget_components.mk
index 934fa8f4564f..e193d2ce37c5 100644
--- a/postprocess/CustomTarget_components.mk
+++ b/postprocess/CustomTarget_components.mk
@@ -29,7 +29,7 @@ $(postprocess_WORKDIR)/services_componentfiles.list: \
$(foreach comp,$(gb_ComponentTarget__ALLCOMPONENTS),$(call
gb_ComponentTarget_get_target,$(comp))) \
| $(postprocess_WORKDIR)/.dir
$(call gb_Output_announce,$(subst $(BUILDDIR)/,,$@),$(true),GEN,2)
- TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),1, \
+ TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)), \
$(foreach comp,$(sort $(gb_ComponentTarget__ALLCOMPONENTS)),$(call
gb_ComponentTarget_get_target,$(comp))$(gb_NEWLINE))) && \
mv $$TEMPFILE $@
diff --git a/postprocess/CustomTarget_images.mk
b/postprocess/CustomTarget_images.mk
index 90709780ae22..b915aacf988a 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -51,7 +51,7 @@ $(packimages_DIR)/images_%.zip : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
$(call gb_Helper_abbreviate_dirs, \
- ILSTFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(filter
%.ilst,$^)) && \
+ ILSTFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(filter
%.ilst,$^)) && \
$(call gb_ExternalExecutable_get_command,python) \
$(SRCDIR)/solenv/bin/pack_images.py \
$(if $(DEFAULT_THEME),\
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index cf9a3432f1ce..b97a7932b15d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -652,7 +652,7 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
- mv $(call gb_var2file,$@.tmp,70,<list> $(foreach
i,$(postprocess_DEPS_$*), <dependency file='$i'/>) \
+ mv $(call gb_var2file,$@.tmp,<list> $(foreach i,$(postprocess_DEPS_$*),
<dependency file='$i'/>) \
$(foreach i,$(postprocess_OPTDEPS_$*), <dependency file='$i'
optional='true'/>) \
$(foreach i,$(postprocess_FILES_$*),
<filename>$(i)</filename>) </list>) \
$@
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index aee2750e9904..c86732bf0bb9 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -19,21 +19,21 @@ $(call gb_AutoInstall_get_target,%) :
$(GBUILDDIR)/AutoInstall.mk \
$(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_Output_announce,$*,$(true),AIN,3)
$(call gb_Trace_StartRange,$*,AIN)
- SDKLIBFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
+ SDKLIBFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
$(lib) \
$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))) \
../../program/$(call
gb_Library_get_runtime_filename,$(lib)))) \
- && LIBFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
+ && LIBFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(foreach lib,$(gb_Library_MODULE_$*),\
$(lib) \
$(call gb_Library_get_runtime_filename,$(lib)))) \
- && EXEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
+ && EXEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(foreach exe,$(gb_Executable_MODULE_$*),\
$(exe) \
$(call gb_Executable_get_filename,$(exe)))) \
- && JARFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(gb_Jar_MODULE_$*)) \
- && PKGFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(gb_Package_MODULE_$*)) \
+ && JARFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(gb_Jar_MODULE_$*)) \
+ && PKGFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(gb_Package_MODULE_$*)) \
&& $(call gb_ExternalExecutable_get_command,python) \
$(GBUILDDIR)/gen-autoinstall.py \
'$*' '$(SCP2COMPONENTCONDITION)' \
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 5459b913288d..56c81be93481 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -219,7 +219,7 @@ gb_XcuMergeTarget_CFGEXDEPS := $(call
gb_Executable_get_runtime_dependencies,cfg
gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
define gb_XcuMergeTarget__command
-MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
+MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(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 1ea43aa1218a..1237640fb13e 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -57,7 +57,7 @@ ifneq ($(WITH_LANG),)
define gb_CustomTarget_ulfex__command
$(call gb_Output_announce,$(1),$(true),ULF,1)
$(call gb_Trace_StartRange,$(1),ULF)
-MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(3)) && \
+MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(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/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index b86f1b49370f..e4fda64f64b4 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -62,7 +62,7 @@ gb_PropertiesTranslateTarget_DEPS := $(call
gb_Executable_get_runtime_dependenci
define gb_PropertiesTranslateTarget__command
$(call gb_Helper_abbreviate_dirs, \
$(if $(filter-out qtz,$(LANGUAGE)), \
- MERGEINPUT=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(POFILE)) && \
+ MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(POFILE))
&& \
$(gb_PropertiesTranslateTarget_COMMAND) \
-i $(PROPERTIES_FILE) \
-l $(LANGUAGE) \
@@ -127,7 +127,7 @@ gb_DescriptionTranslateTarget_DEPS := $(call
gb_Executable_get_runtime_dependenc
define gb_DescriptionTranslateTarget__command
$(call gb_Helper_abbreviate_dirs,\
- MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
+ MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(POFILES)) && \
$(gb_DescriptionTranslateTarget_COMMAND) \
-i $(DESCRIPTION_XML) \
-l all \
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 0dce9757ba96..ce074832e995 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -81,7 +81,7 @@ else
$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS)
$(gb_Helper_LANGSTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
$(call gb_Trace_StartRange,$*/description.xml,XRM)
- MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
+ MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(POFILES)) && \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_Extension_get_workdir,$*) && \
$(gb_Extension_XRMEXCOMMAND) \
@@ -108,7 +108,7 @@ $(call gb_Extension_get_target,%) : \
$(if $(LICENSE),cp -f $(LICENSE) $(call
gb_Extension_get_rootdir,$*)/registration &&) \
$(if $(and $(gb_Extension_TRANS_LANGS),$(DESCRIPTION)),cp
$(foreach lang,$(gb_Extension_TRANS_LANGS),$(call
gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call
gb_Extension_get_rootdir,$*) &&) \
cd $(call gb_Extension_get_rootdir,$*) && \
- ZIPFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,$(sort
$(FILES))) && \
+ ZIPFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(sort
$(FILES))) && \
$(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
$(call gb_Extension_get_target,$*) \
`cat $${ZIPFILES} | tr -d '\r'` && rm $${ZIPFILES})
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 56d5157ef40c..42f280e1aad6 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -17,7 +17,7 @@ gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery
define gb_Gallery__command
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
- RESPONSEFILE=$(call gb_var2file,$(shell $(call
gb_MKTEMP)),100,$(GALLERY_FILES)) && \
+ RESPONSEFILE=$(call gb_var2file,$(shell $(call
gb_MKTEMP)),$(GALLERY_FILES)) && \
$(call gb_Helper_print_on_error,\
$(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
--build-tree \
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 64ec6e278018..c4bbfabc7aac 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -37,10 +37,10 @@ gb_HelpTranslatePartTarget_DEPS := $(call
gb_Executable_get_runtime_dependencies
gb_HelpTranslatePartTarget_COMMAND := $(call gb_Executable_get_command,helpex)
define gb_HelpTranslatePartTarget__command
-HELPFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(sort $(filter
%.xhp,$(3)))) && \
+HELPFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(sort $(filter
%.xhp,$(3)))) && \
$(call gb_Helper_abbreviate_dirs, \
$(if $(filter-out qtz,$(HELP_LANG)), \
- POFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(sort
$(POFILES))) && \
+ POFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(sort
$(POFILES))) && \
$(gb_HelpTranslatePartTarget_COMMAND) \
-l $(HELP_LANG) \
-mi $${HELPFILES} \
@@ -191,7 +191,7 @@ gb_HelpTreeTarget_COMMAND := $(call
gb_Executable_get_command,treex)
define gb_HelpTreeTarget__command
$(call gb_Helper_abbreviate_dirs,\
$(if $(filter-out qtz,$(HELP_LANG)), \
- POFILES=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(POFILES)) && \
+ POFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(POFILES)) &&
\
$(gb_HelpTreeTarget_COMMAND) \
-i $(HELP_TREE) \
-l $(HELP_LANG) \
@@ -290,7 +290,7 @@ gb_HelpLinkTarget_DEPS := \
# the ones outside the dir by HelpLinker
define gb_HelpLinkTarget__command
$(if $(HELP_INDEXED),rm -rf $(addprefix
$(HELP_WORKDIR)/,$(HELP_INDEXED)) && \)
-RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
+RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
-lang $(HELP_LANG) \
-mod $(HELP_MODULE) \
$(if $(HELP_INDEXED),,-noindex) \
@@ -567,7 +567,7 @@ $(dir $(call gb_HelpTarget_get_target,%))%/.dir :
# Translation of the module's .xhp files and all used modules is done.
# Also creates the list for gb_HelpTarget_get_filelist.
$(call gb_HelpTarget_get_translation_target,%) :
- rm -f $@ && mv $(call gb_var2file,$@.tmp,100,$(strip $(HELP_FILES))) $@
+ rm -f $@ && mv $(call gb_var2file,$@.tmp,$(strip $(HELP_FILES))) $@
# Translation of the module's .xhp files and all used and linked modules
# is done.
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 096b3f4e575c..a6c7121ae740 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -29,7 +29,7 @@ endef
define gb_InstallScript__command
$(call gb_Helper_abbreviate_dirs,\
- RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(call gb_InstallScript__make_arglist,\
$(call gb_InstallScript__get_files,$(SCP_MODULES))) \
) && \
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 0e402db67df2..dc86f722978d 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -42,7 +42,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(if $(filter-out $(JARDEPS),$(4)), \
rm -rf $(call gb_JavaClassSet_get_classdir,$(2))/* && \
- RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,\
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(filter-out $(JARDEPS) $(T_JAVA9FILES),$(4))) && \
$(if $(3),$(call
gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) \
$(gb_JavaClassSet_JAVACDEBUG) \
@@ -51,7 +51,7 @@ $(call gb_Helper_abbreviate_dirs,\
@$$RESPONSEFILE &&) \
rm -f $$RESPONSEFILE &&) \
$(if $(T_MODULENAME),\
- RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),500,\
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(T_JAVA9FILES)) && \
$(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \
$(gb_JavaClassSet_JAVACDEBUG) \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index cc98d18bd4b7..6634649e5ade 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -722,7 +722,7 @@ gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
.PHONY : $(WORKDIR)/Clean/LinkTarget/%
$(WORKDIR)/Clean/LinkTarget/% :
$(call gb_Output_announce,$(LINKTARGETMAKEFILENAME),$(false),LNK,4)
- RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),200,\
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_dep_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_dwo_target,$(object))) \
@@ -783,7 +783,7 @@ $(call gb_Output_announce,LNK:$(2).d,$(true),DEP,1)
$(call gb_Trace_StartRange,LNK:$(2),DEP)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
- RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),200,\
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_dep_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_dep_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call
gb_ObjCObject_get_dep_target,$(object)))\
@@ -805,7 +805,7 @@ endef
# call gb_LinkTarget__command_objectlist,linktarget
define gb_LinkTarget__command_objectlist
-TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),200,\
+TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call
gb_ObjCObject_get_target,$(object))) \
@@ -894,7 +894,7 @@ define gb_LinkTarget__static_dep_x_template
define gb_LinkTarget__command_dep_$(1)
$$(call gb_Output_announce,LNK:$$(2).d.$(1),$$(true),DEP,1)
mkdir -p $$(dir $$(1)) && \
-TEMPFILE=$$(call gb_var2file,$$(shell $$(gb_MKTEMP)),200,\
+TEMPFILE=$$(call gb_var2file,$$(shell $$(gb_MKTEMP)),\
$$(call gb_LinkTarget__get_all_$(1),$$(2))) && \
$$(call gb_Helper_replace_if_different_and_touch,$$$${TEMPFILE},$$(1))
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 9c90322cfcdc..957c0e8c90a9 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -64,7 +64,7 @@ $(dir $(call gb_Package_get_target,%))%/.dir :
.PHONY : $(call gb_Package_get_clean_target,%)
$(call gb_Package_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PKG,2)
- RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(FILES)) \
&& cat $${RESPONSEFILE} | $(if $(filter WNT,$(OS)),env -i
PATH="$$PATH") xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -fr \
&& rm -f $${RESPONSEFILE}
@@ -82,7 +82,7 @@ $(call gb_Package_get_target,%) :
$(call gb_Trace_StartRange,$*,PKG)
$(if $(PACKAGE_DEFINED),,$(call gb_Output_error,$(RDEPENDS) depend(s)
on package $* which does not exist.))
rm -f $@ && \
- mv $(call gb_var2file,$@.tmp,100,$(sort $(FILES))) $@
+ mv $(call gb_var2file,$@.tmp,$(sort $(FILES))) $@
$(call gb_Trace_EndRange,$*,PKG)
# for other targets that want to create Packages, does not register at Module
diff --git a/solenv/gbuild/PrecompiledHeaders.mk
b/solenv/gbuild/PrecompiledHeaders.mk
index b6d3ecdfe0d9..bb60c92dae2e 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -70,7 +70,7 @@ $(call gb_PrecompiledHeader_get_target,$(1),$(3)) :
$$(call
gb_PrecompiledHeader__sum_command,$$@,$(1),$$<,$(gb_PrecompiledHeader_cxxflags_includes),$$(INCLUDE),$(3),$(5))
ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_Helper_abbreviate_dirs,\
- RESPONSEFILE=$$(call gb_var2file,$$(shell
$$(gb_MKTEMP)),200,$$(call gb_PrecompiledHeader_get_dep_target_tmp,$(1),$(3)))
&& \
+ RESPONSEFILE=$$(call gb_var2file,$$(shell
$$(gb_MKTEMP)),$$(call gb_PrecompiledHeader_get_dep_target_tmp,$(1),$(3))) && \
$$(call gb_Executable_get_command,concat-deps)
$$$${RESPONSEFILE} \
> $$(call
gb_PrecompiledHeader_get_dep_target,$(1),$(3)) && \
rm -f $$$${RESPONSEFILE} $$(call
gb_PrecompiledHeader_get_dep_target_tmp,$(1),$(3)))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 45058888d02a..136e1c2ee4dd 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -11,7 +11,7 @@ gb_Rdb__get_install_target =
$(INSTROOT)/$(LIBO_ETC_FOLDER)/services/$(1).rdb
define gb_Rdb__command
$(call gb_Helper_abbreviate_dirs,\
- RESPONSEFILE=$(call gb_var2file,$(shell $(call gb_MKTEMP)),70,\
+ RESPONSEFILE=$(call gb_var2file,$(shell $(call gb_MKTEMP)),\
<list> \
$(foreach component,$(COMPONENTS),\
<filename>$(call
gb_ComponentTarget_get_target,$(component))</filename>) \
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk
index a88f0133963b..94dd1e88e19a 100644
--- a/solenv/gbuild/Tempfile.mk
+++ b/solenv/gbuild/Tempfile.mk
@@ -18,7 +18,7 @@
#
define gb_var2file
-$(file >$(1),$(3))$(1)
+$(file >$(1),$(2))$(1)
endef
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 563ab82a2716..25a53dfa0a59 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -28,7 +28,7 @@ gb_UnoApiTarget_UNOIDLCHECKCOMMAND := $(call
gb_Executable_get_command,unoidl-ch
define gb_UnoApiTarget__command
mkdir -p $(dir $(1)) \
$(if $(UNOAPI_ENTITIES), \
- && RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),500,$(UNOAPI_ENTITIES))) \
+ && RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(UNOAPI_ENTITIES))) \
&& $(gb_UnoApiTarget_UNOIDLWRITECOMMAND) \
$(foreach rdb,$(UNOAPI_DEPRDBS),$(call
gb_UnoApiTarget_get_target,$(rdb))) \
$(SRCDIR)/$(gb_UnoApiTarget_REG_$(2)) $(if
$(UNOAPI_ENTITIES),@$${RESPONSEFILE}) $(1) \
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index b2debba77812..07195358ea94 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -46,7 +46,7 @@ $(call gb_Zip_get_target,%) :
$(call gb_Trace_StartRange,$*,ZIP)
$(call gb_Helper_abbreviate_dirs,\
$(if $(FILES),\
- RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),500,\
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(FILES)) && \
cd $(LOCATION) && \
cat $${RESPONSEFILE} | tr "[:space:]" "\n" | \
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk
b/solenv/gbuild/extensions/post_GbuildToJson.mk
index f1707a488f43..2656c1966d0b 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -44,36 +44,36 @@ mkdir -p $(WORKDIR)/GbuildToJson/$(dir $(2))
mkdir -p $(WORKDIR)/LinkTarget/$(dir $(2))
$(if
$(GBUILDTOJSON_LD_LIBRARY_PATH),LD_LIBRARY_PATH=$(GBUILDTOJSON_LD_LIBRARY_PATH))
\
$(call gb_Executable_get_command,gbuildtojson) \
---makefile=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_MAKEFILE)) \
---linktarget=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(2)) \
---ilibtarget=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(ILIBTARGET)) \
---cxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(CXXOBJECTS)) \
---yaccobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(YACCOBJECTS)) \
---objcobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(OBJCOBJECTS)) \
---objcxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(OBJCXXOBJECTS))
\
---cxxclrobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(CXXCLROBJECTS))
\
---asmobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(ASMOBJECTS)) \
---lexobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(LEXOBJECTS)) \
---gencobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(GENCOBJECTS)) \
---gencxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXOBJECTS))
\
---gencxxclrobjects=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(GENCXXCLROBJECTS)) \
---cobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(COBJECTS)) \
---javaobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(JAVAOBJECTS)) \
---pythonobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(PYTHONOBJECTS))
\
---cflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS)) \
---cflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(T_CFLAGS_APPEND)) \
---cxxflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXFLAGS)) \
---cxxflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(T_CXXFLAGS_APPEND)) \
---objcflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCFLAGS)) \
---objcflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(T_OBJCFLAGS_APPEND)) \
---objcxxflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCXXFLAGS)) \
---objcxxflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(T_OBJCXXFLAGS_APPEND)) \
---cxxclrflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXCLRFLAGS)) \
---cxxclrflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(T_CXXCLRFLAGS_APPEND)) \
---defs=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(DEFS)) \
---include=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(INCLUDE)) \
---linked_libs=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(LINKED_LIBS)) \
---linked_static_libs=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(LINKED_STATIC_LIBS)) \
+--makefile=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(T_MAKEFILE)) \
+--linktarget=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(2)) \
+--ilibtarget=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(ILIBTARGET)) \
+--cxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(CXXOBJECTS)) \
+--yaccobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(YACCOBJECTS)) \
+--objcobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(OBJCOBJECTS)) \
+--objcxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(OBJCXXOBJECTS)) \
+--cxxclrobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(CXXCLROBJECTS)) \
+--asmobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(ASMOBJECTS)) \
+--lexobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(LEXOBJECTS)) \
+--gencobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(GENCOBJECTS)) \
+--gencxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(GENCXXOBJECTS)) \
+--gencxxclrobjects=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(GENCXXCLROBJECTS)) \
+--cobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(COBJECTS)) \
+--javaobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(JAVAOBJECTS)) \
+--pythonobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(PYTHONOBJECTS)) \
+--cflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(T_CFLAGS)) \
+--cflagsappend=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(T_CFLAGS_APPEND)) \
+--cxxflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(T_CXXFLAGS)) \
+--cxxflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(T_CXXFLAGS_APPEND)) \
+--objcflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(T_OBJCFLAGS)) \
+--objcflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(T_OBJCFLAGS_APPEND)) \
+--objcxxflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(T_OBJCXXFLAGS)) \
+--objcxxflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(T_OBJCXXFLAGS_APPEND)) \
+--cxxclrflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(T_CXXCLRFLAGS)) \
+--cxxclrflagsappend=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(T_CXXCLRFLAGS_APPEND)) \
+--defs=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(DEFS)) \
+--include=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(INCLUDE)) \
+--linked_libs=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(LINKED_LIBS)) \
+--linked_static_libs=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(LINKED_STATIC_LIBS)) \
> $(WORKDIR)/GbuildToJson/$(2)
endef
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index f1affe79e905..157edc310f72 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -251,7 +251,7 @@ $(call gb_Output_announce,$(2),$(true),LNK,4)
$(call gb_Trace_StartRange,$(2),LNK)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
- RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100, \
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)), \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
@@ -700,7 +700,7 @@ endif
# use responsefile because cui has too many files for command line
define gb_UIConfig__command
$(call gb_Helper_abbreviate_dirs,\
- RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(if
$(UI_IMAGELISTS),$(strip $(UI_IMAGELISTS)),/dev/null)) \
+ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(if
$(UI_IMAGELISTS),$(strip $(UI_IMAGELISTS)),/dev/null)) \
&& tr " " "\000" < $$RESPONSEFILE | tr -d "\r\n" > $$RESPONSEFILE.0 \
&& $(SORT) -u --files0-from=$$RESPONSEFILE.0 > $@ \
&& rm $$RESPONSEFILE $$RESPONSEFILE.0 \
@@ -712,7 +712,7 @@ endef
define gb_UIConfig__gla11y_command
$(call gb_ExternalExecutale__check_registration,python)
$(call gb_Helper_abbreviate_dirs,\
- FILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \
+ FILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(UIFILES)) && \
$(gb_UIConfig_LXML_PATH) $(if
$(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \
$(call gb_ExternalExecutable_get_command,python) \
$(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L
$$FILES && \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 5c072cba4dff..f1491b1117cf 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -99,7 +99,7 @@ endef
define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\
- FILELIST=$(call gb_var2file,$(shell $(gb_MKTEMP)),100, \
+ FILELIST=$(call gb_var2file,$(shell $(gb_MKTEMP)), \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
diff --git a/static/CustomTarget_emscripten_fs_image.mk
b/static/CustomTarget_emscripten_fs_image.mk
index 38ad8d2d9a3d..e8810bd2e2f7 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -1514,7 +1514,7 @@ $(emscripten_fs_image_WORKDIR)/soffice.data.filelist: \
$(emscripten_fs_image_WORKDIR)/soffice.data.concat_lists \
$(gb_emscripten_fs_image_files) \
| $(emscripten_fs_image_WORKDIR)/.dir
- TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),1,\
+ TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
$(subst @,@@,$(subst $(BUILDDIR)/,,$(filter
$(BUILDDIR)%,$(gb_emscripten_fs_image_all_files)))) \
$(foreach item,$(filter-out
$(BUILDDIR)%,$(gb_emscripten_fs_image_all_files)),$(subst @,@@,$(item))@$(subst
@,@@,$(subst $(SRCDIR)/,,$(item))))) \
&& mv $$TEMPFILE $@
diff --git a/wizards/CustomTarget_wizards.mk b/wizards/CustomTarget_wizards.mk
index f6a3269ce4f5..f8d88b4283de 100644
--- a/wizards/CustomTarget_wizards.mk
+++ b/wizards/CustomTarget_wizards.mk
@@ -39,7 +39,7 @@ $(wizards_DIR)/resources_%.properties : \
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRP)
$(call gb_Helper_abbreviate_dirs, \
$(if $(filter-out qtz,$(LANGUAGE)), \
- MERGEINPUT=$(call gb_var2file,$(shell
$(gb_MKTEMP)),100,$(POFILE)) && \
+ MERGEINPUT=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(POFILE)) && \
$(call gb_Executable_get_command,propex) \
-i $(SOURCE) \
-o $@ \
