wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1123990 - installer needs voucher.bin; r=glandium, r=cpearce

Browse Source
This commit is contained in:
Mike Shal 2015-01-21 18:27:20 -05:00
parent cfeccb1485
commit a85e0b393f
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/moz-automation.mk
View File

@ -81,6 +81,10 @@ automation/upload: automation/update-packaging
# binaries/libs, and that's what we package/test.
automation/pretty-package: automation/buildsymbols
# The installer and packager both run stage-package, and may conflict
# with each other.
automation/installer: automation/package
# The 'pretty' versions of targets run before the regular ones to avoid
# conflicts in writing to the same files.
automation/installer: automation/pretty-installer

7
toolkit/mozapps/installer/make-eme.mk
View File

@ -6,8 +6,9 @@ include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk
ifdef MOZ_SIGN_CMD
ifeq ($(OS_ARCH),WINNT)
# Note: CWD is DIST
MAKE_SIGN_EME_VOUCHER := $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(STAGEPATH)$(MOZ_PKG_DIR)/plugin-container.exe -output $(STAGEPATH)$(MOZ_PKG_DIR)/voucher.bin && \
$(MOZ_SIGN_CMD) -f emevoucher "$(STAGEPATH)$(MOZ_PKG_DIR)/voucher.bin"
# The argument to this macro is the directory where plugin-container.exe
# exists, and where voucher.bin will be generated.
MAKE_SIGN_EME_VOUCHER = $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(1)/plugin-container.exe -output $(1)/voucher.bin && \
$(MOZ_SIGN_CMD) -f emevoucher "$(1)/voucher.bin"
endif
endif

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

@ -22,11 +22,12 @@ endif
@echo 'Staging installer files...'
@$(NSINSTALL) -D $(DEPTH)/installer-stage/core
@cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core
@(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD))
ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
# The && true is necessary to make sure Pymake spins a shell
$(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage && true
endif
$(call MAKE_SIGN_EME_VOUCHER,$(DEPTH)/installer-stage/core)
@(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD))
# Override the value of OMNIJAR_NAME from config.status with the value
# set earlier in this file.

3
toolkit/mozapps/installer/packager.py
View File

@ -27,7 +27,6 @@ from mozpack.unify import UnifiedBuildFinder
import mozpack.path
import buildconfig
from argparse import ArgumentParser
from createprecomplete import generate_precomplete
import os
from StringIO import StringIO
import subprocess
@ -394,8 +393,6 @@ def main():
args.source, gre_path, base)
copier.copy(args.destination)
generate_precomplete(os.path.normpath(os.path.join(args.destination,
respath)))
if __name__ == '__main__':

6
toolkit/mozapps/installer/upload-files.mk
View File

@ -524,15 +524,17 @@ ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
ifeq (Darwin, $(OS_ARCH))
MAKE_PACKAGE = cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME) \
&& cd $(PACKAGE_BASE_DIR) \
&& (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(CREATE_PRECOMPLETE_CMD)) \
&& $(INNER_MAKE_PACKAGE)
else
MAKE_PACKAGE = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \
&& $(or $(MAKE_SIGN_EME_VOUCHER),true) \
&& $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)),true) \
&& (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(CREATE_PRECOMPLETE_CMD)) \
&& $(INNER_MAKE_PACKAGE)
endif #Darwin
else
MAKE_PACKAGE = $(INNER_MAKE_PACKAGE)
MAKE_PACKAGE = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE)
endif
ifdef MOZ_SIGN_PACKAGE_CMD