mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use spaces in the product names when packaging.

Browse Source 
Change-Id: I55f332117cc7530eb6d562846db379d95e628a22
This commit is contained in:
Jan Holesovsky
2016-08-02 09:15:37 +01:00
parent cc252e1641
commit 010a2a8ed3
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
instsetoo_native/CustomTarget_install.mk
View File

@@ -59,6 +59,8 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT)
instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG)) instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG))
PRODUCTNAME_no_spaces := $(subst $(WHITESPACE),,$(PRODUCTNAME))
ifeq (WNT,$(OS)) ifeq (WNT,$(OS))
define instsetoo_native_msitemplates define instsetoo_native_msitemplates
@@ -80,7 +82,7 @@ $(foreach pkgformat,$(5),\
&& $(PERL) -w $< \ && $(PERL) -w $< \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p $(PRODUCTNAME)$(3) \ -p $(PRODUCTNAME_no_spaces)$(3) \
-u $(instsetoo_OUT) \ -u $(instsetoo_OUT) \
-buildid $(if $(filter deb0 rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \ -buildid $(if $(filter deb0 rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
@@ -98,13 +100,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
rm -rf $(instsetoo_OUT) rm -rf $(instsetoo_OUT)
ifeq (TRUE,$(LIBO_TEST_INSTALL)) ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive) $(call instsetoo_native_install_command,openoffice,en-US,,,archive)
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME)/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)/ mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice* rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME)_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 \ mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
$(TESTINSTALLDIR)/ $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK

5
solenv/bin/ooinstall
View File

@@ -89,11 +89,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
print "Running LibreOffice installer\n"; print "Running LibreOffice installer\n";
my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
$PRODUCTNAME_no_spaces =~ s/ //g;
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl " . "perl " .
(scalar keys(%DB::sub) ? "-d " : "") . (scalar keys(%DB::sub) ? "-d " : "") .
"-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " . "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p $ENV{PRODUCTNAME}" . " " . "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p $PRODUCTNAME_no_spaces " .
"-u $tmp_dir " . "-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " . "-buildid $BUILD $destdir $strip $msi " .
"-simple $path") && die "Failed to install: $!"; "-simple $path") && die "Failed to install: $!";