Bug 732962 - Implement signing on demand for xulrunner. r=catlee,ted, a=lsblakk
authorRail Aliiev <rail@mozilla.com>
Wed, 14 Mar 2012 14:15:39 -0400
changeset 88585 438dd47e6f698dccab6b1bfecb059a29ef2990eb
parent 88584 e6540031ea081ce5111187fad602b9da73b66223
child 88586 fc318c39e8202f092bd5247da4dc00502365e02d
push id684
push userraliiev@mozilla.com
push dateWed, 14 Mar 2012 18:27:56 +0000
treeherdermozilla-beta@fc318c39e820 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscatlee, ted, lsblakk
bugs732962
milestone12.0
Bug 732962 - Implement signing on demand for xulrunner. r=catlee,ted, a=lsblakk
toolkit/mozapps/installer/packager.mk
xulrunner/installer/Makefile.in
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -73,16 +73,18 @@ endif
 
 PACKAGE       = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)
 
 # By default, the SDK uses the same packaging type as the main bundle,
 # but on mac it is a .tar.bz2
 SDK_PATH      = $(PKG_PATH)
 ifeq ($(MOZ_APP_NAME),xulrunner)
 SDK_PATH = sdk/
+# Don't codesign xulrunner internally
+MOZ_INTERNAL_SIGNING_FORMAT =
 endif
 SDK_SUFFIX    = $(PKG_SUFFIX)
 SDK           = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX)
 
 # JavaScript Shell packaging
 ifndef LIBXUL_SDK
 JSSHELL_BINS  = \
   $(DIST)/bin/js$(BIN_SUFFIX) \
@@ -554,16 +556,21 @@ MAKE_PACKAGE    = $(PREPARE_PACKAGE) && 
 else
 MAKE_PACKAGE    = $(PREPARE_PACKAGE) && $(INNER_MAKE_PACKAGE)
 endif
 
 ifdef MOZ_SIGN_PACKAGE_CMD
 MAKE_PACKAGE    += && $(MOZ_SIGN_PACKAGE_CMD) "$(PACKAGE)"
 endif
 
+ifdef MOZ_SIGN_CMD
+MAKE_SDK           += && $(MOZ_SIGN_CMD) -f gpg $(SDK)
+UPLOAD_EXTRA_FILES += $(SDK).asc
+endif
+
 # dummy macro if we don't have PSM built
 SIGN_NSS		=
 ifdef MOZ_CAN_RUN_PROGRAMS
 ifdef MOZ_PSM
 SIGN_NSS		= echo signing nss libraries;
 
 NSS_DLL_SUFFIX	= $(DLL_SUFFIX)
 ifdef UNIVERSAL_BINARY
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -64,16 +64,17 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
 INSTALL_SDK = 1
 ifndef MOZ_PLATFORM_MAEMO
 GENERATE_CACHE = 1
 endif
 
+include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
 # Add pkg-config files to the install:: target
 
 pkg_config_files = \
 	libxul.pc \
 	libxul-embedding.pc \
 	mozilla-js.pc \