From 47dcc3b9a5a8b2ccca93b29543597014331285ad Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Thu, 25 Feb 2016 10:40:31 -0800 Subject: [PATCH] Bug 1250991 - Indent code; r=mshal This file is so hard to read. Add some indentation to make it easier to grok. I also converted some useless tabs to spaces. MozReview-Commit-ID: 7DFKeW66uD6 --- toolkit/mozapps/installer/upload-files.mk | 420 +++++++++++----------- 1 file changed, 212 insertions(+), 208 deletions(-) diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 375bb443e97..fb331d0b22d 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -113,136 +113,140 @@ CREATE_FINAL_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \ UNPACK_TAR = tar -xf- ifeq ($(MOZ_PKG_FORMAT),TAR) -PKG_SUFFIX = .tar -INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) > $(PACKAGE) -INNER_UNMAKE_PACKAGE = $(UNPACK_TAR) < $(UNPACKAGE) -MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk > '$(SDK)' + PKG_SUFFIX = .tar + INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) > $(PACKAGE) + INNER_UNMAKE_PACKAGE = $(UNPACK_TAR) < $(UNPACKAGE) + MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk > '$(SDK)' endif + ifeq ($(MOZ_PKG_FORMAT),TGZ) -PKG_SUFFIX = .tar.gz -INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | gzip -vf9 > $(PACKAGE) -INNER_UNMAKE_PACKAGE = gunzip -c $(UNPACKAGE) | $(UNPACK_TAR) -MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | gzip -vf9 > '$(SDK)' + PKG_SUFFIX = .tar.gz + INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | gzip -vf9 > $(PACKAGE) + INNER_UNMAKE_PACKAGE = gunzip -c $(UNPACKAGE) | $(UNPACK_TAR) + MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | gzip -vf9 > '$(SDK)' endif + ifeq ($(MOZ_PKG_FORMAT),BZ2) -PKG_SUFFIX = .tar.bz2 -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - -C $(STAGEPATH)$(MOZ_PKG_DIR) $(_APPNAME) | bzip2 -vf > $(PACKAGE) -else -INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | bzip2 -vf > $(PACKAGE) -endif -INNER_UNMAKE_PACKAGE = bunzip2 -c $(UNPACKAGE) | $(UNPACK_TAR) -MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > '$(SDK)' + PKG_SUFFIX = .tar.bz2 + ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) + INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - -C $(STAGEPATH)$(MOZ_PKG_DIR) $(_APPNAME) | bzip2 -vf > $(PACKAGE) + else + INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | bzip2 -vf > $(PACKAGE) + endif + INNER_UNMAKE_PACKAGE = bunzip2 -c $(UNPACKAGE) | $(UNPACK_TAR) + 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)) -endif -PKG_SUFFIX = .zip -INNER_MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \ - -x \*/.mkdir.done -INNER_UNMAKE_PACKAGE = $(UNZIP) $(UNPACKAGE) -MAKE_SDK = $(call py_action,zip,'$(SDK)' $(MOZ_APP_NAME)-sdk) + ifdef MOZ_EXTERNAL_SIGNING_FORMAT + # We can't use sha2signcode on zip files + MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out sha2signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT)) + endif + PKG_SUFFIX = .zip + INNER_MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \ + -x \*/.mkdir.done + INNER_UNMAKE_PACKAGE = $(UNZIP) $(UNPACKAGE) + MAKE_SDK = $(call py_action,zip,'$(SDK)' $(MOZ_APP_NAME)-sdk) endif + ifeq ($(MOZ_PKG_FORMAT),SFX7Z) -PKG_SUFFIX = .exe -INNER_MAKE_PACKAGE = rm -f app.7z && \ - mv $(MOZ_PKG_DIR) core && \ - $(CYGWIN_WRAPPER) 7z a -r -t7z app.7z -mx -m0=BCJ2 -m1=LZMA:d25 \ - -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3 && \ - mv core $(MOZ_PKG_DIR) && \ - cat $(SFX_HEADER) app.7z > $(PACKAGE) && \ - chmod 0755 $(PACKAGE) -INNER_UNMAKE_PACKAGE = $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) core && \ - mv core $(MOZ_PKG_DIR) + PKG_SUFFIX = .exe + INNER_MAKE_PACKAGE = rm -f app.7z && \ + mv $(MOZ_PKG_DIR) core && \ + $(CYGWIN_WRAPPER) 7z a -r -t7z app.7z -mx -m0=BCJ2 -m1=LZMA:d25 \ + -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3 && \ + mv core $(MOZ_PKG_DIR) && \ + cat $(SFX_HEADER) app.7z > $(PACKAGE) && \ + chmod 0755 $(PACKAGE) + INNER_UNMAKE_PACKAGE = $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) core && \ + mv core $(MOZ_PKG_DIR) endif #Create an RPM file ifeq ($(MOZ_PKG_FORMAT),RPM) -PKG_SUFFIX = .rpm -MOZ_NUMERIC_APP_VERSION = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[^0-9.].*//' ) -MOZ_RPM_RELEASE = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[0-9.]*//' ) + PKG_SUFFIX = .rpm + MOZ_NUMERIC_APP_VERSION = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[^0-9.].*//' ) + MOZ_RPM_RELEASE = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[0-9.]*//' ) -RPMBUILD_TOPDIR=$(ABS_DIST)/rpmbuild -RPMBUILD_RPMDIR=$(ABS_DIST) -RPMBUILD_SRPMDIR=$(ABS_DIST) -RPMBUILD_SOURCEDIR=$(RPMBUILD_TOPDIR)/SOURCES -RPMBUILD_SPECDIR=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm -RPMBUILD_BUILDDIR=$(ABS_DIST)/.. + RPMBUILD_TOPDIR=$(ABS_DIST)/rpmbuild + RPMBUILD_RPMDIR=$(ABS_DIST) + RPMBUILD_SRPMDIR=$(ABS_DIST) + RPMBUILD_SOURCEDIR=$(RPMBUILD_TOPDIR)/SOURCES + RPMBUILD_SPECDIR=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm + RPMBUILD_BUILDDIR=$(ABS_DIST)/.. -SPEC_FILE = $(RPMBUILD_SPECDIR)/mozilla.spec -RPM_INCIDENTALS=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm + SPEC_FILE = $(RPMBUILD_SPECDIR)/mozilla.spec + RPM_INCIDENTALS=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm -RPM_CMD = \ - echo Creating RPM && \ - $(PYTHON) -m mozbuild.action.preprocessor \ - -DMOZ_APP_NAME=$(MOZ_APP_NAME) \ - -DMOZ_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME)' \ - $(RPM_INCIDENTALS)/mozilla.desktop \ - -o $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \ - rm -rf $(ABS_DIST)/$(TARGET_CPU) && \ - $(RPMBUILD) -bb \ - $(SPEC_FILE) \ - --target $(TARGET_CPU) \ - --buildroot $(RPMBUILD_TOPDIR)/BUILDROOT \ - --define 'moz_app_name $(MOZ_APP_NAME)' \ - --define 'moz_app_displayname $(MOZ_APP_DISPLAYNAME)' \ - --define 'moz_app_version $(MOZ_APP_VERSION)' \ - --define 'moz_numeric_app_version $(MOZ_NUMERIC_APP_VERSION)' \ - --define 'moz_rpm_release $(MOZ_RPM_RELEASE)' \ - --define 'buildid $(BUILDID)' \ - --define 'moz_source_repo $(shell awk '$$2 == "MOZ_SOURCE_REPO" {print $$3}' $(DEPTH)/source-repo.h)' \ - --define 'moz_source_stamp $(shell awk '$$2 == "MOZ_SOURCE_STAMP" {print $$3}' $(DEPTH)/source-repo.h)' \ - --define 'moz_branding_directory $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)' \ - --define '_topdir $(RPMBUILD_TOPDIR)' \ - --define '_rpmdir $(RPMBUILD_RPMDIR)' \ - --define '_sourcedir $(RPMBUILD_SOURCEDIR)' \ - --define '_specdir $(RPMBUILD_SPECDIR)' \ - --define '_srcrpmdir $(RPMBUILD_SRPMDIR)' \ - --define '_builddir $(RPMBUILD_BUILDDIR)' \ - --define '_prefix $(prefix)' \ - --define '_libdir $(libdir)' \ - --define '_bindir $(bindir)' \ - --define '_datadir $(datadir)' \ - --define '_installdir $(installdir)' + RPM_CMD = \ + echo Creating RPM && \ + $(PYTHON) -m mozbuild.action.preprocessor \ + -DMOZ_APP_NAME=$(MOZ_APP_NAME) \ + -DMOZ_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME)' \ + $(RPM_INCIDENTALS)/mozilla.desktop \ + -o $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \ + rm -rf $(ABS_DIST)/$(TARGET_CPU) && \ + $(RPMBUILD) -bb \ + $(SPEC_FILE) \ + --target $(TARGET_CPU) \ + --buildroot $(RPMBUILD_TOPDIR)/BUILDROOT \ + --define 'moz_app_name $(MOZ_APP_NAME)' \ + --define 'moz_app_displayname $(MOZ_APP_DISPLAYNAME)' \ + --define 'moz_app_version $(MOZ_APP_VERSION)' \ + --define 'moz_numeric_app_version $(MOZ_NUMERIC_APP_VERSION)' \ + --define 'moz_rpm_release $(MOZ_RPM_RELEASE)' \ + --define 'buildid $(BUILDID)' \ + --define 'moz_source_repo $(shell awk '$$2 == "MOZ_SOURCE_REPO" {print $$3}' $(DEPTH)/source-repo.h)' \ + --define 'moz_source_stamp $(shell awk '$$2 == "MOZ_SOURCE_STAMP" {print $$3}' $(DEPTH)/source-repo.h)' \ + --define 'moz_branding_directory $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)' \ + --define '_topdir $(RPMBUILD_TOPDIR)' \ + --define '_rpmdir $(RPMBUILD_RPMDIR)' \ + --define '_sourcedir $(RPMBUILD_SOURCEDIR)' \ + --define '_specdir $(RPMBUILD_SPECDIR)' \ + --define '_srcrpmdir $(RPMBUILD_SRPMDIR)' \ + --define '_builddir $(RPMBUILD_BUILDDIR)' \ + --define '_prefix $(prefix)' \ + --define '_libdir $(libdir)' \ + --define '_bindir $(bindir)' \ + --define '_datadir $(datadir)' \ + --define '_installdir $(installdir)' -ifdef ENABLE_TESTS -RPM_CMD += \ - --define 'createtests yes' \ - --define '_testsinstalldir $(shell basename $(installdir))' -endif + ifdef ENABLE_TESTS + RPM_CMD += \ + --define 'createtests yes' \ + --define '_testsinstalldir $(shell basename $(installdir))' + endif -ifdef INSTALL_SDK -RPM_CMD += \ - --define 'createdevel yes' \ - --define '_idldir $(idldir)' \ - --define '_sdkdir $(sdkdir)' \ - --define '_includedir $(includedir)' -endif + ifdef INSTALL_SDK + RPM_CMD += \ + --define 'createdevel yes' \ + --define '_idldir $(idldir)' \ + --define '_sdkdir $(sdkdir)' \ + --define '_includedir $(includedir)' + endif -#For each of the main, tests, sdk rpms we want to make sure that -#if they exist that they are in objdir/dist/ and that they get -#uploaded and that they are beside the other build artifacts -MAIN_RPM= $(MOZ_APP_NAME)-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) -UPLOAD_EXTRA_FILES += $(MAIN_RPM) -RPM_CMD += && mv $(TARGET_CPU)/$(MAIN_RPM) $(ABS_DIST)/ + #For each of the main, tests, sdk rpms we want to make sure that + #if they exist that they are in objdir/dist/ and that they get + #uploaded and that they are beside the other build artifacts + MAIN_RPM= $(MOZ_APP_NAME)-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) + UPLOAD_EXTRA_FILES += $(MAIN_RPM) + RPM_CMD += && mv $(TARGET_CPU)/$(MAIN_RPM) $(ABS_DIST)/ -ifdef ENABLE_TESTS -TESTS_RPM=$(MOZ_APP_NAME)-tests-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) -UPLOAD_EXTRA_FILES += $(TESTS_RPM) -RPM_CMD += && mv $(TARGET_CPU)/$(TESTS_RPM) $(ABS_DIST)/ -endif + ifdef ENABLE_TESTS + TESTS_RPM=$(MOZ_APP_NAME)-tests-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) + UPLOAD_EXTRA_FILES += $(TESTS_RPM) + RPM_CMD += && mv $(TARGET_CPU)/$(TESTS_RPM) $(ABS_DIST)/ + endif -ifdef INSTALL_SDK -SDK_RPM=$(MOZ_APP_NAME)-devel-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) -UPLOAD_EXTRA_FILES += $(SDK_RPM) -RPM_CMD += && mv $(TARGET_CPU)/$(SDK_RPM) $(ABS_DIST)/ -endif + ifdef INSTALL_SDK + SDK_RPM=$(MOZ_APP_NAME)-devel-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) + UPLOAD_EXTRA_FILES += $(SDK_RPM) + RPM_CMD += && mv $(TARGET_CPU)/$(SDK_RPM) $(ABS_DIST)/ + endif -INNER_MAKE_PACKAGE = $(RPM_CMD) -#Avoiding rpm repacks, going to try creating/uploading xpi in rpm files instead -INNER_UNMAKE_PACKAGE = $(error Try using rpm2cpio and cpio) + INNER_MAKE_PACKAGE = $(RPM_CMD) + #Avoiding rpm repacks, going to try creating/uploading xpi in rpm files instead + INNER_UNMAKE_PACKAGE = $(error Try using rpm2cpio and cpio) endif #Create an RPM file @@ -539,70 +543,70 @@ INNER_UNMAKE_PACKAGE = \ endif ifeq ($(MOZ_PKG_FORMAT),DMG) -PKG_SUFFIX = .dmg + PKG_SUFFIX = .dmg -_ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd) -PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_DIR) -INNER_MAKE_PACKAGE = $(call py_action,make_dmg,'$(PKG_DMG_SOURCE)' '$(PACKAGE)') -INNER_UNMAKE_PACKAGE = \ - set -ex; \ - rm -rf $(ABS_DIST)/unpack.tmp; \ - mkdir -p $(ABS_DIST)/unpack.tmp; \ - $(_ABS_MOZSRCDIR)/build/package/mac_osx/unpack-diskimage $(UNPACKAGE) /tmp/$(MOZ_PKG_APPNAME)-unpack $(ABS_DIST)/unpack.tmp; \ - rsync -a '$(ABS_DIST)/unpack.tmp/$(_APPNAME)' $(MOZ_PKG_DIR); \ - test -n '$(MOZ_PKG_MAC_DSSTORE)' && \ - rsync -a '$(ABS_DIST)/unpack.tmp/.DS_Store' '$(MOZ_PKG_MAC_DSSTORE)'; \ - test -n '$(MOZ_PKG_MAC_BACKGROUND)' && \ - rsync -a '$(ABS_DIST)/unpack.tmp/.background/$(notdir $(MOZ_PKG_MAC_BACKGROUND))' '$(MOZ_PKG_MAC_BACKGROUND)'; \ - test -n '$(MOZ_PKG_MAC_ICON)' && \ - rsync -a '$(ABS_DIST)/unpack.tmp/.VolumeIcon.icns' '$(MOZ_PKG_MAC_ICON)'; \ - rm -rf $(ABS_DIST)/unpack.tmp; \ - if test -n '$(MOZ_PKG_MAC_RSRC)' ; then \ - cp $(UNPACKAGE) $(MOZ_PKG_APPNAME).tmp.dmg && \ - hdiutil unflatten $(MOZ_PKG_APPNAME).tmp.dmg && \ - { /Developer/Tools/DeRez -skip plst -skip blkx $(MOZ_PKG_APPNAME).tmp.dmg > '$(MOZ_PKG_MAC_RSRC)' || { rm -f $(MOZ_PKG_APPNAME).tmp.dmg && false; }; } && \ - rm -f $(MOZ_PKG_APPNAME).tmp.dmg; \ - fi -# The plst and blkx resources are skipped because they belong to each -# individual dmg and are created by hdiutil. -SDK_SUFFIX = .tar.bz2 -MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > '$(SDK)' + _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd) + PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_DIR) + INNER_MAKE_PACKAGE = $(call py_action,make_dmg,'$(PKG_DMG_SOURCE)' '$(PACKAGE)') + INNER_UNMAKE_PACKAGE = \ + set -ex; \ + rm -rf $(ABS_DIST)/unpack.tmp; \ + mkdir -p $(ABS_DIST)/unpack.tmp; \ + $(_ABS_MOZSRCDIR)/build/package/mac_osx/unpack-diskimage $(UNPACKAGE) /tmp/$(MOZ_PKG_APPNAME)-unpack $(ABS_DIST)/unpack.tmp; \ + rsync -a '$(ABS_DIST)/unpack.tmp/$(_APPNAME)' $(MOZ_PKG_DIR); \ + test -n '$(MOZ_PKG_MAC_DSSTORE)' && \ + rsync -a '$(ABS_DIST)/unpack.tmp/.DS_Store' '$(MOZ_PKG_MAC_DSSTORE)'; \ + test -n '$(MOZ_PKG_MAC_BACKGROUND)' && \ + rsync -a '$(ABS_DIST)/unpack.tmp/.background/$(notdir $(MOZ_PKG_MAC_BACKGROUND))' '$(MOZ_PKG_MAC_BACKGROUND)'; \ + test -n '$(MOZ_PKG_MAC_ICON)' && \ + rsync -a '$(ABS_DIST)/unpack.tmp/.VolumeIcon.icns' '$(MOZ_PKG_MAC_ICON)'; \ + rm -rf $(ABS_DIST)/unpack.tmp; \ + if test -n '$(MOZ_PKG_MAC_RSRC)' ; then \ + cp $(UNPACKAGE) $(MOZ_PKG_APPNAME).tmp.dmg && \ + hdiutil unflatten $(MOZ_PKG_APPNAME).tmp.dmg && \ + { /Developer/Tools/DeRez -skip plst -skip blkx $(MOZ_PKG_APPNAME).tmp.dmg > '$(MOZ_PKG_MAC_RSRC)' || { rm -f $(MOZ_PKG_APPNAME).tmp.dmg && false; }; } && \ + rm -f $(MOZ_PKG_APPNAME).tmp.dmg; \ + fi + # The plst and blkx resources are skipped because they belong to each + # individual dmg and are created by hdiutil. + SDK_SUFFIX = .tar.bz2 + MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > '$(SDK)' endif ifdef MOZ_INTERNAL_SIGNING_FORMAT -MOZ_SIGN_PREPARED_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_INTERNAL_SIGNING_FORMAT),-f $(f)) $(foreach i,$(SIGN_INCLUDES),-i $(i)) $(foreach x,$(SIGN_EXCLUDES),-x $(x)) -ifeq (WINNT,$(OS_ARCH)) -MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd '$(ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i' -endif + MOZ_SIGN_PREPARED_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_INTERNAL_SIGNING_FORMAT),-f $(f)) $(foreach i,$(SIGN_INCLUDES),-i $(i)) $(foreach x,$(SIGN_EXCLUDES),-x $(x)) + ifeq (WINNT,$(OS_ARCH)) + MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd '$(ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i' + endif endif # For final GPG / authenticode signing / dmg signing if required ifdef MOZ_EXTERNAL_SIGNING_FORMAT -MOZ_SIGN_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) + MOZ_SIGN_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) endif ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD -ifeq (Darwin, $(OS_ARCH)) -MAKE_PACKAGE = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \ - && cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME) \ - && cd $(PACKAGE_BASE_DIR) && $(INNER_MAKE_PACKAGE) -else -MAKE_PACKAGE = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \ - && $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)),true) \ - && (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \ - && $(INNER_MAKE_PACKAGE) -endif #Darwin + ifeq (Darwin, $(OS_ARCH)) + MAKE_PACKAGE = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \ + && cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME) \ + && cd $(PACKAGE_BASE_DIR) && $(INNER_MAKE_PACKAGE) + else + MAKE_PACKAGE = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \ + && $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)),true) \ + && (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \ + && $(INNER_MAKE_PACKAGE) + endif #Darwin else -MAKE_PACKAGE = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE) + MAKE_PACKAGE = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE) endif ifdef MOZ_SIGN_PACKAGE_CMD -MAKE_PACKAGE += && $(MOZ_SIGN_PACKAGE_CMD) '$(PACKAGE)' + MAKE_PACKAGE += && $(MOZ_SIGN_PACKAGE_CMD) '$(PACKAGE)' endif ifdef MOZ_SIGN_CMD -MAKE_SDK += && $(MOZ_SIGN_CMD) -f gpg '$(SDK)' + MAKE_SDK += && $(MOZ_SIGN_CMD) -f gpg '$(SDK)' endif NO_PKG_FILES += \ @@ -643,23 +647,23 @@ NO_PKG_FILES += \ # If a manifest has not been supplied, the following # files should be excluded from the package too ifndef MOZ_PKG_MANIFEST -NO_PKG_FILES += ssltunnel* + NO_PKG_FILES += ssltunnel* endif ifdef MOZ_DMD -NO_PKG_FILES += SmokeDMD + NO_PKG_FILES += SmokeDMD endif DEFINES += -DDLL_PREFIX=$(DLL_PREFIX) -DDLL_SUFFIX=$(DLL_SUFFIX) -DBIN_SUFFIX=$(BIN_SUFFIX) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -DEFINES += -DDIR_MACOS=Contents/MacOS/ -DDIR_RESOURCES=Contents/Resources/ + DEFINES += -DDIR_MACOS=Contents/MacOS/ -DDIR_RESOURCES=Contents/Resources/ else -DEFINES += -DDIR_MACOS= -DDIR_RESOURCES= + DEFINES += -DDIR_MACOS= -DDIR_RESOURCES= endif ifdef MOZ_FOLD_LIBS -DEFINES += -DMOZ_FOLD_LIBS=1 + DEFINES += -DMOZ_FOLD_LIBS=1 endif GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE) @@ -675,32 +679,32 @@ PKG_ARG = , '$(pkg)' # from the now deprecated MOZ_PKG_MANIFEST_P when MOZ_PKG_MANIFEST is not # defined. ifndef MOZ_PKG_MANIFEST -ifdef MOZ_PKG_MANIFEST_P -MOZ_PKG_MANIFEST := $(MOZ_PKG_MANIFEST_P) -endif # MOZ_PKG_MANIFEST_P + ifdef MOZ_PKG_MANIFEST_P + MOZ_PKG_MANIFEST := $(MOZ_PKG_MANIFEST_P) + endif # MOZ_PKG_MANIFEST_P endif # MOZ_PKG_MANIFEST # For smooth transition of comm-central ifndef MOZ_PACKAGER_FORMAT -ifeq ($(MOZ_CHROME_FILE_FORMAT),flat) -ifdef MOZ_OMNIJAR -MOZ_PACKAGER_FORMAT := omni -else -MOZ_PACKAGER_FORMAT := flat -endif -endif + ifeq ($(MOZ_CHROME_FILE_FORMAT),flat) + ifdef MOZ_OMNIJAR + MOZ_PACKAGER_FORMAT := omni + else + MOZ_PACKAGER_FORMAT := flat + endif + endif endif ifndef MOZ_PACKAGER_FORMAT -MOZ_PACKAGER_FORMAT = $(error MOZ_PACKAGER_FORMAT is not set) + MOZ_PACKAGER_FORMAT = $(error MOZ_PACKAGER_FORMAT is not set) endif ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -OPTIMIZEJARS = 1 -ifneq (gonk,$(MOZ_WIDGET_TOOLKIT)) -ifdef NIGHTLY_BUILD -DISABLE_JAR_COMPRESSION = 1 -endif -endif + OPTIMIZEJARS = 1 + ifneq (gonk,$(MOZ_WIDGET_TOOLKIT)) + ifdef NIGHTLY_BUILD + DISABLE_JAR_COMPRESSION = 1 + endif + endif endif # A js binary is needed to perform verification of JavaScript minification. @@ -708,13 +712,13 @@ endif # (such as release automation) can provide their own js binary to enable # verification when cross-compiling. ifndef JS_BINARY -ifndef CROSS_COMPILE -JS_BINARY = $(wildcard $(DIST)/bin/js) -endif + ifndef CROSS_COMPILE + JS_BINARY = $(wildcard $(DIST)/bin/js) + endif endif ifeq ($(OS_TARGET), WINNT) -INSTALLER_PACKAGE = $(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe + INSTALLER_PACKAGE = $(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe endif # These are necessary because some of our packages/installers contain spaces @@ -736,13 +740,13 @@ CHECKSUM_FILES = $(CHECKSUM_FILE) # Upload MAR tools only if AB_CD is unset or en_US ifeq (,$(AB_CD:en-US=)) -ifeq (WINNT,$(OS_TARGET)) -UPLOAD_EXTRA_FILES += host/bin/mar.exe -UPLOAD_EXTRA_FILES += host/bin/mbsdiff.exe -else -UPLOAD_EXTRA_FILES += host/bin/mar -UPLOAD_EXTRA_FILES += host/bin/mbsdiff -endif + ifeq (WINNT,$(OS_TARGET)) + UPLOAD_EXTRA_FILES += host/bin/mar.exe + UPLOAD_EXTRA_FILES += host/bin/mbsdiff.exe + else + UPLOAD_EXTRA_FILES += host/bin/mar + UPLOAD_EXTRA_FILES += host/bin/mbsdiff + endif endif UPLOAD_FILES= \ @@ -772,41 +776,41 @@ UPLOAD_FILES= \ $(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f)))) ifdef MOZ_CRASHREPORTER_UPLOAD_FULL_SYMBOLS -UPLOAD_FILES += \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip) + UPLOAD_FILES += \ + $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip) endif ifdef MOZ_CODE_COVERAGE -UPLOAD_FILES += \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(CODE_COVERAGE_ARCHIVE_BASENAME).zip) + UPLOAD_FILES += \ + $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(CODE_COVERAGE_ARCHIVE_BASENAME).zip) endif ifdef UNIFY_DIST -UNIFY_ARCH := $(notdir $(patsubst %/,%,$(dir $(UNIFY_DIST)))) -UPLOAD_FILES += \ - $(call QUOTED_WILDCARD,$(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX)) \ - $(call QUOTED_WILDCARD,$(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX).asc) + UNIFY_ARCH := $(notdir $(patsubst %/,%,$(dir $(UNIFY_DIST)))) + UPLOAD_FILES += \ + $(call QUOTED_WILDCARD,$(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX)) \ + $(call QUOTED_WILDCARD,$(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX).asc) endif SIGN_CHECKSUM_CMD= ifdef MOZ_SIGN_CMD -# If we're signing with gpg, we'll have a bunch of extra detached signatures to -# upload. We also want to sign our checksums file -SIGN_CHECKSUM_CMD=$(MOZ_SIGN_CMD) -f gpg $(CHECKSUM_FILE) + # If we're signing with gpg, we'll have a bunch of extra detached signatures to + # upload. We also want to sign our checksums file + SIGN_CHECKSUM_CMD=$(MOZ_SIGN_CMD) -f gpg $(CHECKSUM_FILE) -CHECKSUM_FILES += $(CHECKSUM_FILE).asc -UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR).asc) -UPLOAD_FILES += $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR).asc)) -UPLOAD_FILES += $(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE).asc) -UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE).asc) + CHECKSUM_FILES += $(CHECKSUM_FILE).asc + UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR).asc) + UPLOAD_FILES += $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR).asc)) + UPLOAD_FILES += $(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE).asc) + UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE).asc) endif ifdef MOZ_STUB_INSTALLER -UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe) + UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe) endif ifndef MOZ_PKG_SRCDIR -MOZ_PKG_SRCDIR = $(topsrcdir) + MOZ_PKG_SRCDIR = $(topsrcdir) endif SRC_TAR_PREFIX = $(MOZ_APP_NAME)-$(MOZ_PKG_VERSION) @@ -819,7 +823,7 @@ SRC_TAR_EXCLUDE_PATHS += \ --exclude='$(MOZILLA_DIR)/Makefile' \ --exclude='$(MOZILLA_DIR)/dist' ifdef MOZ_OBJDIR -SRC_TAR_EXCLUDE_PATHS += --exclude='$(MOZ_OBJDIR)' + SRC_TAR_EXCLUDE_PATHS += --exclude='$(MOZ_OBJDIR)' endif CREATE_SOURCE_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \ --mode=go-w $(SRC_TAR_EXCLUDE_PATHS) --transform='s,^\./,$(SRC_TAR_PREFIX)/,' -f @@ -832,9 +836,9 @@ SOURCE_UPLOAD_FILES = $(SOURCE_TAR) HG ?= hg CREATE_HG_BUNDLE_CMD = $(HG) -v -R $(topsrcdir) bundle --base null ifdef HG_BUNDLE_REVISION -CREATE_HG_BUNDLE_CMD += -r $(HG_BUNDLE_REVISION) + CREATE_HG_BUNDLE_CMD += -r $(HG_BUNDLE_REVISION) endif CREATE_HG_BUNDLE_CMD += $(HG_BUNDLE_FILE) ifdef UPLOAD_HG_BUNDLE -SOURCE_UPLOAD_FILES += $(HG_BUNDLE_FILE) + SOURCE_UPLOAD_FILES += $(HG_BUNDLE_FILE) endif