diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-04 22:30:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:54 +0200 |
| commit | e85ddc17698168046d452df35cacfeac3932eedb (patch) | |
| tree | a23b9259bd29522beeaeeb53a2faac53669e896c /solenv | |
| parent | 59801c706d440d15b0baf0aec4aad30a9c55bd8f (diff) | |
gbuild: UIConfig: response file to work around Win32 command line limit
Change-Id: I74d7ed5dd35e51168cc788a8336cf932b92102ca
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UIConfig.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 10 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/com_MSC_class.mk | 13 |
3 files changed, 24 insertions, 3 deletions
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 55882347675d..7fdb7e1d8152 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -184,9 +184,7 @@ $(call gb_UIConfig_get_target,%) : $(call gb_UIConfig_get_imagelist_target,%) ) $(call gb_UIConfig_get_imagelist_target,%) : - $(call gb_Helper_abbreviate_dirs,\ - sort -u $(UI_IMAGELISTS) /dev/null > $@ \ - ) + $(call gb_UIConfig__command) .PHONY : $(call gb_UIConfig_get_clean_target,%) $(call gb_UIConfig_get_clean_target,%) : diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 3c109fea83be..6c8c57456b0d 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -207,4 +207,14 @@ gb_LinkTarget_get_linksearchpath_for_layer = \ gb_ICU_PRECOMMAND := $(call gb_Helper_extend_ld_path,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib) +# UIConfig class + +# Mac OS X sort(1) cannot read a response file +define gb_UIConfig__command +$(call gb_Helper_abbreviate_dirs,\ + sort -u $(UI_IMAGELISTS) /dev/null > $@ \ +) + +endef + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 60fb59e38016..784022302058 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -537,6 +537,19 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif +# UIConfig class + +# use responsefile because cui has too many files for command line +define gb_UIConfig__command +$(call gb_Helper_abbreviate_dirs,\ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(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 \ +) + +endef + # UIMenubarTarget class define gb_UIMenubarTarget__command |