зеркало из https://github.com/mozilla/gecko-dev.git
bug 1075723: use different signing format for 64-bit windows builds - fix external packaging special casing. r=mshal, a=bustage
This commit is contained in:
Родитель
ddfb6b16b7
Коммит
35ff8e3695
|
@ -162,7 +162,7 @@ endif
|
|||
ifeq ($(MOZ_PKG_FORMAT),ZIP)
|
||||
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
|
||||
# We can't use signcode on zip files
|
||||
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
|
||||
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
|
||||
endif
|
||||
PKG_SUFFIX = .zip
|
||||
INNER_MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \
|
||||
|
|
|
@ -47,7 +47,7 @@ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
|
|||
|
||||
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
|
||||
# We can't use signcode on mar files
|
||||
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
|
||||
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
|
||||
MOZ_EXTERNAL_SIGNING_FORMAT := mar $(MOZ_EXTERNAL_SIGNING_FORMAT)
|
||||
endif
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче