bug 723176: support mac dmg signing in the build system. r=khuey/ted

This commit is contained in:
Ben Hearsum 2012-05-22 17:13:26 -04:00
parent ab9253304f
commit d78c3f7ce0
5 changed files with 56 additions and 0 deletions

View File

@ -0,0 +1 @@
_CodeSignature/CodeResources

View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>rules</key>
<dict>
<key>^Info.plist$</key>
<true/>
<key>^PkgInfo$</key>
<true/>
<key>^MacOS/</key>
<true/>
<key>^Resources/</key>
<true/>
<key>^MacOS/extensions/.*</key><dict>
<key>omit</key>
<true/>
</dict>
<key>^MacOS/distribution/.*</key><dict>
<key>omit</key>
<true/>
</dict>
<key>^MacOS/updates/.*</key><dict>
<key>omit</key>
<true/>
</dict>
<key>^MacOS/active-update.xml$</key><dict>
<key>omit</key>
<true/>
</dict>
<key>^MacOS/defaults/.*</key><dict>
<key>omit</key>
<true/>
</dict>
<key>^MacOS/mozilla.cfg$</key><dict>
<key>omit</key>
<true/>
</dict>
<key>^MacOS/updates.xml$</key><dict>
<key>omit</key>
<true/>
</dict>
</dict>
</dict>
</plist>

View File

@ -24,6 +24,8 @@
@APPNAME@/Contents/Info.plist
@APPNAME@/Contents/PkgInfo
@APPNAME@/Contents/Resources/
@APPNAME@/Contents/CodeResources
@APPNAME@/Contents/_CodeSignature/CodeResources
#endif
[@AB_CD@]

View File

@ -553,8 +553,15 @@ MOZ_SIGN_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),
endif
ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
ifeq (Darwin, $(OS_ARCH))
MAKE_PACKAGE = $(PREPARE_PACKAGE) \
&& cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME) && cd $(_ABS_DIST) \
&& $(INNER_MAKE_PACKAGE)
else
MAKE_PACKAGE = $(PREPARE_PACKAGE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) \
$(MOZ_PKG_DIR) && $(INNER_MAKE_PACKAGE)
endif #Darwin
else
MAKE_PACKAGE = $(PREPARE_PACKAGE) && $(INNER_MAKE_PACKAGE)
endif

View File

@ -23,6 +23,7 @@ SIGN_EXCLUDES := \
endif # Windows
ifeq (Darwin, $(OS_ARCH))
MOZ_INTERNAL_SIGNING_FORMAT := dmg
MOZ_EXTERNAL_SIGNING_FORMAT := gpg
endif # Darwin