Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 13:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 732962 - Implement signing on demand for xulrunner. r=ted,catlee

Browse Source
This commit is contained in:
Rail Aliiev 2012-03-12 13:39:35 -04:00
parent 60b540afa7
commit 675a826ddf
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolkit/mozapps/installer/packager.mk
View File

@ -78,6 +78,8 @@ PACKAGE = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)
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)
@ -567,6 +569,11 @@ 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

1
xulrunner/installer/Makefile.in
View File

@ -69,6 +69,7 @@ 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