strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Skip some executables in the OS X sandboxed (Mac App Store) case

Browse source 
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
This commit is contained in:
Tor Lillqvist 2014-09-20 01:01:09 +03:00 committed by Andras Timar
parent 02c0669017
commit 8ba6e0d6b1
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile.in
View file

@ -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

2
Repository.mk
View file

@ -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) \
$(if $(ENABLE_MACOSX_SANDBOX),, \
regmerge \
regview \
) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
))

2
registry/Module_registry.mk
View file

@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry))
$(eval $(call gb_Module_add_targets,registry,\
Library_reg \
$(if $(filter-out $(OS),IOS), \
$(if $(ENABLE_MACOSX_SANDBOX),, \
Executable_regmerge \
Executable_regview \
) \
StaticLibrary_registry_helper \
) \
))