diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-23 00:27:58 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-08 10:08:55 +0100 |
| commit | ff489b6161654d378c70ed5e3f6be82e24ec09c9 (patch) | |
| tree | c482851ba2112b00fa4386efe1a7b9f35ee47737 /Makefile.in | |
| parent | d0f39bc3b82e4835ede9b136e81ff2e18bd12cd6 (diff) | |
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.
(cherry picked from commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5)
Conflicts:
Makefile.in
Repository.mk
Conflicts:
Makefile.in
Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index f38aa9b3deae..2f7e4ccf2492 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 |