instsetoo_native/CustomTarget_install.mk | 2 +- instsetoo_native/CustomTarget_setup.mk | 2 +- solenv/bin/modules/installer/download.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit ad40492c5d8d9438e3495eeec6bb5b8c7e8d82d2 Author: Thorsten Behrens <[email protected]> AuthorDate: Tue Jun 11 01:51:23 2019 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Jun 11 01:53:54 2019 +0200 Hack to make rpmbuild get a proper build root Otherwise rpm BUILDROOT will contain spaces, and things break at various places during packaging Change-Id: I20229ce533913fa000978aa84b1a2a5d998da14d diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 63103816e89f..c1776053ec1e 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -290,7 +290,7 @@ sub get_downloadname_productname my $start = ""; - $start = $allvariables->{'PRODUCTNAME'}; + $start = $allvariables->{'PRODUCTNAME'}; $start =~ s/ /_/g; return $start; } commit 375ed9b83aa182c3d080b0ff6ea6d5fcdc74ed30 Author: Thorsten Behrens <[email protected]> AuthorDate: Tue Jun 11 01:24:26 2019 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Jun 11 01:53:27 2019 +0200 Use productname w/o space for config dir And also save us the duplicate work Change-Id: I64cb50ffe925b03648514b68a719a593e0fec898 diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 016fbbd03abd..bd8a0f657cbd 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -59,7 +59,7 @@ 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)) +PRODUCTNAME_no_spaces := $(PRODUCTNAME_WITHOUT_SPACES) ifeq (WNT,$(OS)) define instsetoo_native_msitemplates diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index ec31d718a6a0..4d47d8d894e8 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -40,7 +40,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'InstallMode=<installmode>' \ && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ $(if $(ENABLE_RELEASE_BUILD),\ - && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME_WITHOUT_SPACES) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME_WITHOUT_SPACES))/4', \ && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
