Makefile.in | 20 ++++++++++---------- instsetoo_native/util/openoffice.lst.in | 4 ++-- solenv/bin/ooinstall | 5 ++++- 3 files changed, 16 insertions(+), 13 deletions(-)
New commits: commit 31ff3a7eabdf6ca07486de815bbbcc49df8f4a61 Author: Tor Lillqvist <[email protected]> Date: Tue Aug 2 20:36:32 2016 +0300 Use LibreOffice Vanilla in more places Change-Id: I07aefbdf6c6c7290b1c7c347f11dc76964bb2488 diff --git a/Makefile.in b/Makefile.in index 0905d68..d1b8075 100644 --- a/Makefile.in +++ b/Makefile.in @@ -307,37 +307,37 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) # # Create Resources/*.lproj directories for languages supported by OS X set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \ - lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \ + lproj=$(TESTINSTALLDIR)/LibreOfficeVanilla$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \ mkdir $$lproj; \ done # # And remove the "bin" folder which should not be there - rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin + rm -rf $(TESTINSTALLDIR)/LibreOfficeVanilla$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin # # Remove unnecessary executables in the LibreOfficePython framework - rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/bin + rm -rf $(TESTINSTALLDIR)/LibreOfficeVanilla$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/bin # # Remove the python.o object file which is weird and interferes with app store uploading # And with it removed, presumably the other stuff in the Python lib/python3.3/config-3.3m probably does not make sense either. - rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]* + rm -rf $(TESTINSTALLDIR)/LibreOfficeVanilla$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]* # ifneq ($ENABLE_MACOSX_SANDBOX),) # Remove the gengal.bin binary and unopkg script that we don't want - rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin - rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/unopkg + rm $(TESTINSTALLDIR)/LibreOfficeVanilla$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin + rm $(TESTINSTALLDIR)/LibreOfficeVanilla$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/unopkg endif # # Then use the macosx-codesign-app-bundle script - @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app + @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOfficeVanilla$(if $(ENABLE_RELEASE_BUILD),,Dev).app endif endif @$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR)) mac-app-store-package: test-install ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),) - rm -rf "$(MACOSX_APP_NAME).app" - mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app" - productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' '-').pkg + rm -rf LibreOfficeVanilla.app + mv "$(TESTINSTALLDIR)/LibreOfficeVanilla.app" "LibreOffice Vanilla.app" + productbuild --component "LibreOffice Vanilla.app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "LibreOfficeVanilla.pkg else @echo You did not provide an installer signing identity with --enable-macosx-package-signing @exit 1 diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 5f51117..f832793 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -38,13 +38,13 @@ Globals } } -LibreOffice +LibreOfficeVanilla { Settings { variables { - PRODUCTNAME LibreOffice + PRODUCTNAME LibreOffice Vanilla PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ POSTVERSIONEXTENSION diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index f9034cd..edd3d83 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -89,11 +89,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") { print "Running LibreOffice installer\n"; +my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME}; +$PRODUCTNAME_no_spaces =~ s/ //g; + system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . "perl " . (scalar keys(%DB::sub) ? "-d " : "") . "-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 " . "-buildid $BUILD $destdir $strip $msi " . "-simple $path") && die "Failed to install: $!"; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
