diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-20 01:01:09 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-04 11:17:55 +0100 |
| commit | 8ba6e0d6b1471d56fd0733d5966bdc2e34cc0a05 (patch) | |
| tree | d3bc14089dfa8e05b0dc2d546dd435f343a07541 | |
| parent | Mention that there are two disjunct sets of callbacks (diff) | |
| download | core-8ba6e0d6b1471d56fd0733d5966bdc2e34cc0a05.tar.gz core-8ba6e0d6b1471d56fd0733d5966bdc2e34cc0a05.zip | |
Skip some executables in the OS X sandboxed (Mac App Store) case
I doubt end-users will miss gengal.bin, regview, or regmerge.
We need the gengal program at build time. But don't bother shipping
it on OS X, at least not in the sandboxed (App Store) case.
Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | Repository.mk | 6 | ||||
| -rw-r--r-- | registry/Module_registry.mk | 6 |
3 files changed, 22 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index a5461ca42d56..7ff9cb56a0cd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -316,6 +316,20 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) done # And remove the "bin" folder which should not be there rm -rf $(TESTINSTALLDIR)/LibreOffice$(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 +# +# 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]* +# +ifneq ($ENABLE_MACOSX_SANDBOX),) +# Remove the gengal.bin binary that we don't want + rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin +endif +# +# Then use the macosx-codesign-app-bundle script @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app endif endif diff --git a/Repository.mk b/Repository.mk index df446f6f03e2..e9cd89a5f438 100644 --- a/Repository.mk +++ b/Repository.mk @@ -190,8 +190,10 @@ endif $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - regmerge \ - regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + regmerge \ + regview \ + ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index cbb052eb7f4e..907b90f1434b 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ Library_reg \ $(if $(filter-out $(OS),IOS), \ - Executable_regmerge \ - Executable_regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + Executable_regmerge \ + Executable_regview \ + ) \ StaticLibrary_registry_helper \ ) \ )) |