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

Backed out changeset e1833c2684f0 (bug 1079858) for windows xpcshell failures CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2015-09-08 12:58:03 -07:00
parent 8184080ab6
commit c31674018e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/mozapps/installer/signing.mk
View File

@ -8,8 +8,8 @@ ifndef MOZ_PROFILE_GENERATE
# Signing support
ifdef MOZ_SIGN_CMD
ifeq (WINNT,$(OS_ARCH))
MOZ_INTERNAL_SIGNING_FORMAT := sha2signcode
MOZ_EXTERNAL_SIGNING_FORMAT := sha2signcode
MOZ_INTERNAL_SIGNING_FORMAT := osslsigncode
MOZ_EXTERNAL_SIGNING_FORMAT := osslsigncode
SIGN_INCLUDES := \
'*.dll' \
'*.exe' \

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

@ -151,8 +151,8 @@ MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)
endif
ifeq ($(MOZ_PKG_FORMAT),ZIP)
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
# We can't use sha2signcode on zip files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out sha2signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
# We can't use osslsigncode on zip files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
endif
PKG_SUFFIX = .zip
INNER_MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \

4
tools/update-packaging/Makefile.in
View File

@ -46,8 +46,8 @@ include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
# We can't use sha2signcode on mar files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out sha2signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
# We can't use osslsigncode on mar files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
MOZ_EXTERNAL_SIGNING_FORMAT := mar $(MOZ_EXTERNAL_SIGNING_FORMAT)
endif