diff options
| author | Andras Timar <andras.timar@collabora.com> | 2016-03-08 14:34:24 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-06-11 14:28:41 +0200 |
| commit | 4b0c0fe60c057782315de2468be327476c75fe91 (patch) | |
| tree | a773f398f26791cbf225cd0f5c932d25ab79c507 /Makefile.in | |
| parent | bd12286c4e5b6f5f50d7355d1fb011ebc989b064 (diff) | |
s/LibreOffice/CollaboraOffice/
Change-Id: Ia2de1634657ffd6e456c96042b124f8a6a3bd1d0
(cherry picked from commit 4524204e78b2e9b8b95bce108a2951b530c54051)
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 0905d686d3bf..c68ffe3aaa11 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)/CollaboraOffice$(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)/CollaboraOffice$(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)/CollaboraOffice$(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)/CollaboraOffice$(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)/CollaboraOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin + rm $(TESTINSTALLDIR)/CollaboraOffice$(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)/CollaboraOffice$(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 CollaboraOffice.app + mv "$(TESTINSTALLDIR)/CollaboraOffice.app" "CollaboraOffice.app" + productbuild --component "CollaboraOffice.app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) CollaboraOffice.pkg else @echo You did not provide an installer signing identity with --enable-macosx-package-signing @exit 1 |