diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-08-02 09:15:37 +0100 |
|---|---|---|
| committer | timar <timar@centos6-64bit.cbg.collabora.co.uk> | 2016-08-02 09:15:37 +0100 |
| commit | 4d1e53bcbd8af9655ea5d6b1cd5b03436b25feb7 (patch) | |
| tree | c88b2f06a62c3d6da6f37a1965100f176f77ce6d /instsetoo_native | |
| parent | f59bad09088be0dca1f0975166c804f7bbaa25a0 (diff) | |
Don't use spaces in the product names when packaging.
cp-5.1-3
Change-Id: I55f332117cc7530eb6d562846db379d95e628a22
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 8 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 582f79721a20..c5ac2b0ccca5 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -59,6 +59,8 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT) instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG)) +PRODUCTNAME_no_spaces := $(subst $(WHITESPACE),,$(PRODUCTNAME)) + ifeq (WNT,$(OS)) define instsetoo_native_msitemplates @@ -80,7 +82,7 @@ $(foreach pkgformat,$(5),\ && $(PERL) -w $< \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ - -p LibreOffice$(3) \ + -p $(PRODUCTNAME_no_spaces)$(3) \ -u $(instsetoo_OUT) \ -buildid $(if $(filter deb0 rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \ $(if $(filter WNT,$(OS)), \ @@ -98,13 +100,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: rm -rf $(instsetoo_OUT) ifeq (TRUE,$(LIBO_TEST_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,archive) - unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip + unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME_no_spaces)/archive/install/en-US/LibreOffice*_archive.zip mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice* rmdir $(TESTINSTALLDIR)/LibreOffice*_archive ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) - unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip + unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME_no_spaces)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \ $(TESTINSTALLDIR)/ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 505c1a409d41..77343f3e7387 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -39,7 +39,7 @@ Globals } } -Collabora Office +CollaboraOffice { Settings { |