diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2020-12-09 19:59:52 +0300 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-01-07 14:33:21 +0100 |
| commit | 3e789a83b0d11c99157da86d2082b247fe6a7113 (patch) | |
| tree | d301a1f3bd8f3a6aa0bb1540f296e60f10459deb /instsetoo_native | |
| parent | 57a59ad02d2e5e89724c0d2e60cf6e7d99fba005 (diff) | |
Support for signing when PRODUCTNAME contain spaces
Anyway files are stored without spaces, so we should use same name.
Additionally removed PRODUCTNAME_no_spaces variable, it's just a
redundant alias.
Change-Id: I5b88ac3b07d06969f7639a25603392c9d662d3f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108405
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index b9991d208dd4..1dd705217c63 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -62,8 +62,6 @@ 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 @@ -85,7 +83,7 @@ $(foreach pkgformat,$(5),\ && $(if $(filter-out archive,$(pkgformat)),ENABLE_STRIP=1) $(PERL) -w $< \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ - -p $(PRODUCTNAME_no_spaces)$(3) \ + -p $(PRODUCTNAME_WITHOUT_SPACES)$(3) \ -u $(instsetoo_OUT) \ -buildid $(if $(filter deb0 rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \ $(if $(filter WNT,$(OS)), \ @@ -104,13 +102,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)/$(PRODUCTNAME_no_spaces)/archive/install/en-US/LibreOffice*_archive.zip + unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_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)/$(PRODUCTNAME_no_spaces)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip + unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_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 @@ -157,8 +155,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ - $(WORKDIR)/installation/$(PRODUCTNAME)/msi/install/*/*.msi \ + -d $(PRODUCTNAME_WITHOUT_SPACES)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ + $(WORKDIR)/installation/$(PRODUCTNAME_WITHOUT_SPACES)/msi/install/*/*.msi \ && touch $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) @@ -171,8 +169,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ Helppack \ - $(WORKDIR)/installation/$(PRODUCTNAME)_helppack/msi/install/*/*.msi \ + -d $(PRODUCTNAME_WITHOUT_SPACES)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ Helppack \ + $(WORKDIR)/installation/$(PRODUCTNAME_WITHOUT_SPACES)_helppack/msi/install/*/*.msi \ && touch $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) @@ -185,8 +183,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.don $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ SDK \ - $(WORKDIR)/installation/$(PRODUCTNAME)_SDK/msi/install/*/*.msi \ + -d $(PRODUCTNAME_WITHOUT_SPACES)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ SDK \ + $(WORKDIR)/installation/$(PRODUCTNAME_WITHOUT_SPACES)_SDK/msi/install/*/*.msi \ && touch $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) |