From ae8b4f03475200ec1e5d0832520f90d8e82e6570 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 30 Dec 2015 09:33:50 +0900 Subject: [PATCH] Bug 1235676 - Replace _ABS_DIST with ABS_DIST. r=mshal --- b2g/locales/Makefile.in | 16 ++--- browser/locales/Makefile.in | 24 +++---- toolkit/locales/l10n.mk | 30 ++++----- toolkit/mozapps/installer/upload-files.mk | 77 +++++++++++------------ tools/update-packaging/Makefile.in | 2 +- 5 files changed, 74 insertions(+), 75 deletions(-) diff --git a/b2g/locales/Makefile.in b/b2g/locales/Makefile.in index bed33811271f..577ee30875b9 100644 --- a/b2g/locales/Makefile.in +++ b/b2g/locales/Makefile.in @@ -19,8 +19,8 @@ PWD := $(CURDIR) # pulls. You may override them if you provide your own files. You _must_ # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not # work in that case. -ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE) -WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe +ZIP_IN ?= $(ABS_DIST)/$(PACKAGE) +WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe RETRIEVE_WINDOWS_INSTALLER = 1 MOZ_LANGPACK_EID=langpack-$(AB_CD)@b2g.mozilla.org @@ -31,9 +31,9 @@ L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warning PP_TARGETS += L10N_PREF_JS_EXPORTS ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT))) -MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore -MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png -MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns +MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore +MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png +MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ ' endif @@ -41,8 +41,8 @@ ifeq (WINNT,$(OS_ARCH)) UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \ $(NSINSTALL) -D $(STAGEDIST)/uninstall; \ cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \ - $(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \ - cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \ + $(RM) $(ABS_DIST)/l10n-stage/setup.exe; \ + cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \ $(NULL) endif @@ -75,7 +75,7 @@ chrome-%: @$(MAKE) chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* -repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe +repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) @echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).' $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index dec094c25c73..5e6a90d1b3d0 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -35,8 +35,8 @@ PWD := $(CURDIR) # pulls. You may override them if you provide your own files. You _must_ # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not # work in that case. -ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE) -WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe +ZIP_IN ?= $(ABS_DIST)/$(PACKAGE) +WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe RETRIEVE_WINDOWS_INSTALLER = 1 MOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox.mozilla.org @@ -47,9 +47,9 @@ L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warning PP_TARGETS += L10N_PREF_JS_EXPORTS ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT))) -MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore -MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png -MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns +MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore +MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png +MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ ' endif @@ -57,14 +57,14 @@ ifeq (WINNT,$(OS_ARCH)) UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \ $(NSINSTALL) -D $(STAGEDIST)/uninstall; \ cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \ - $(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \ - cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \ + $(RM) $(ABS_DIST)/l10n-stage/setup.exe; \ + cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \ $(NULL) -STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST)/$(PKG_INST_PATH)'; \ - $(RM) '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ - cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ - chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ +STUB_HOOK = $(NSINSTALL) -D '$(ABS_DIST)/$(PKG_INST_PATH)'; \ + $(RM) '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ + cp ../installer/windows/l10ngen/stub.exe '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ + chmod 0755 '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ $(NULL) endif @@ -140,7 +140,7 @@ endif @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* -repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe +repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) @echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).' $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk index f08d3f3e69c1..312e6aea8d61 100644 --- a/toolkit/locales/l10n.mk +++ b/toolkit/locales/l10n.mk @@ -43,11 +43,11 @@ endif # pulls. You may override them if you provide your own files. You _must_ # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not # work in that case. -ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE) -WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe +ZIP_IN ?= $(ABS_DIST)/$(PACKAGE) +WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe # Allows overriding the final destination of the repackaged file -ZIP_OUT ?= $(_ABS_DIST)/$(PACKAGE) +ZIP_OUT ?= $(ABS_DIST)/$(PACKAGE) ACDEFINES += \ -DAB_CD=$(AB_CD) \ @@ -68,15 +68,15 @@ clobber-%: PACKAGER_NO_LIBS = 1 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources +STAGEDIST = $(ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources else -STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR) +STAGEDIST = $(ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR) endif include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk -PACKAGE_BASE_DIR = $(_ABS_DIST)/l10n-stage +PACKAGE_BASE_DIR = $(ABS_DIST)/l10n-stage $(STAGEDIST): AB_CD:=en-US $(STAGEDIST): UNPACKAGE=$(call ESCAPE_WILDCARD,$(ZIP_IN)) @@ -141,7 +141,7 @@ endif ifdef MAKE_COMPLETE_MAR $(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \ MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \ - PACKAGE_BASE_DIR='$(_ABS_DIST)/l10n-stage' + PACKAGE_BASE_DIR='$(ABS_DIST)/l10n-stage' endif # packaging done, undo l10n stuff ifneq (en,$(LPROJ_ROOT)) @@ -168,7 +168,7 @@ TK_DEFINES = $(firstword \ # chrome directory. PKG_ZIP_DIRS = chrome $(or $(DIST_SUBDIRS),$(DIST_SUBDIR)) -langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi +langpack-%: LANGPACK_FILE=$(ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi langpack-%: AB_CD=$* langpack-%: XPI_NAME=locale-$* langpack-%: libs-% @@ -190,20 +190,20 @@ wget-en-US: ifndef WGET $(error Wget not installed) endif - $(NSINSTALL) -D $(_ABS_DIST)/$(PKG_PATH) - (cd $(_ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PACKAGE)') - @echo 'Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PKG_PATH)/$(PACKAGE)' + $(NSINSTALL) -D $(ABS_DIST)/$(PKG_PATH) + (cd $(ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PACKAGE)') + @echo 'Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(ABS_DIST)/$(PKG_PATH)/$(PACKAGE)' ifdef RETRIEVE_WINDOWS_INSTALLER ifeq ($(OS_ARCH), WINNT) - $(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH) - (cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe') - @echo 'Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe' + $(NSINSTALL) -D $(ABS_DIST)/$(PKG_INST_PATH) + (cd $(ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe') + @echo 'Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe' endif endif generate-snippet-%: $(PYTHON) $(MOZILLA_DIR)/tools/update-packaging/generatesnippet.py \ - --mar-path=$(_ABS_DIST)/update \ + --mar-path=$(ABS_DIST)/update \ --application-ini-file=$(STAGEDIST)/application.ini \ --locale=$* \ --product=$(MOZ_PKG_APPNAME) \ diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 14171cbfc0d2..cabfe0bf3f9d 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -46,7 +46,7 @@ STAGEPATH = universal/ endif endif -PACKAGE_BASE_DIR = $(_ABS_DIST) +PACKAGE_BASE_DIR = $(ABS_DIST) PACKAGE = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX) # By default, the SDK uses the same packaging type as the main bundle, @@ -116,7 +116,6 @@ endif # WINNT endif # MOZ_STATIC_JS MAKE_JSSHELL = $(call py_action,zip,-C $(DIST)/bin $(abspath $(PKG_JSSHELL)) $(JSSHELL_BINS)) -_ABS_DIST = $(ABS_DIST) JARLOG_DIR = $(abspath $(DEPTH)/jarlog/) JARLOG_FILE_AB_CD = $(JARLOG_DIR)/$(AB_CD).log @@ -177,12 +176,12 @@ 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_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_BUILDDIR=$(ABS_DIST)/.. SPEC_FILE = $(RPMBUILD_SPECDIR)/mozilla.spec RPM_INCIDENTALS=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm @@ -194,7 +193,7 @@ RPM_CMD = \ -DMOZ_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME)' \ $(RPM_INCIDENTALS)/mozilla.desktop \ -o $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \ - rm -rf $(_ABS_DIST)/$(TARGET_CPU) && \ + rm -rf $(ABS_DIST)/$(TARGET_CPU) && \ $(RPMBUILD) -bb \ $(SPEC_FILE) \ --target $(TARGET_CPU) \ @@ -239,18 +238,18 @@ endif #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)/ +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)/ +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)/ +RPM_CMD += && mv $(TARGET_CPU)/$(SDK_RPM) $(ABS_DIST)/ endif INNER_MAKE_PACKAGE = $(RPM_CMD) @@ -339,8 +338,8 @@ ROBOCOP_PATH = $(abspath $(DEPTH)/mobile/android/tests/browser/robocop) # is used in a series of commands that run under a "cd something", while # $(NSINSTALL) is relative. INNER_ROBOCOP_PACKAGE= \ - cp $(GECKO_APP_AP_PATH)/fennec_ids.txt $(_ABS_DIST) && \ - $(call RELEASE_SIGN_ANDROID_APK,$(ROBOCOP_PATH)/robocop-debug-unsigned-unaligned.apk,$(_ABS_DIST)/robocop.apk) + cp $(GECKO_APP_AP_PATH)/fennec_ids.txt $(ABS_DIST) && \ + $(call RELEASE_SIGN_ANDROID_APK,$(ROBOCOP_PATH)/robocop-debug-unsigned-unaligned.apk,$(ABS_DIST)/robocop.apk) endif else INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Android Robocop for you' @@ -388,9 +387,9 @@ INNER_MAKE_GECKOLIBS_AAR= \ --verbose \ --revision $(geckoaar-revision) \ --topsrcdir '$(topsrcdir)' \ - --distdir '$(_ABS_DIST)' \ + --distdir '$(ABS_DIST)' \ --appname '$(MOZ_APP_NAME)' \ - '$(_ABS_DIST)' + '$(ABS_DIST)' else INNER_MAKE_GECKOLIBS_AAR=echo 'Android geckolibs.aar packaging requires packaging geckoview' endif # MOZ_DISABLE_GECKOVIEW @@ -462,29 +461,29 @@ INNER_SZIP_LIBRARIES = \ $(if $(ALREADY_SZIPPED),,$(foreach lib,$(SZIP_LIBRARIES),host/bin/szip $(MOZ_SZIP_FLAGS) $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib) && )) true # Insert $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex into -# $(_ABS_DIST)/gecko.ap_, producing $(_ABS_DIST)/gecko.apk. +# $(ABS_DIST)/gecko.ap_, producing $(ABS_DIST)/gecko.apk. INNER_MAKE_APK = \ ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \ - unzip -o $(_ABS_DIST)/gecko.ap_ && \ - rm $(_ABS_DIST)/gecko.ap_ && \ - $(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ assets && \ - $(ZIP) $(if $(ALREADY_SZIPPED),-0 ,$(if $(MOZ_ENABLE_SZIP),-0 ))$(_ABS_DIST)/gecko.ap_ $(ASSET_SO_LIBRARIES) && \ - $(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) $(SZIP_LIBRARIES) && \ + unzip -o $(ABS_DIST)/gecko.ap_ && \ + rm $(ABS_DIST)/gecko.ap_ && \ + $(ZIP) -r9D $(ABS_DIST)/gecko.ap_ assets && \ + $(ZIP) $(if $(ALREADY_SZIPPED),-0 ,$(if $(MOZ_ENABLE_SZIP),-0 ))$(ABS_DIST)/gecko.ap_ $(ASSET_SO_LIBRARIES) && \ + $(ZIP) -r9D $(ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) $(SZIP_LIBRARIES) && \ $(if $(filter-out ./,$(OMNIJAR_DIR)), \ mkdir -p $(OMNIJAR_DIR) && mv $(OMNIJAR_NAME) $(OMNIJAR_DIR) && ) \ - $(ZIP) -0 $(_ABS_DIST)/gecko.ap_ $(OMNIJAR_DIR)$(OMNIJAR_NAME)) && \ - rm -f $(_ABS_DIST)/gecko.apk && \ - cp $(_ABS_DIST)/gecko.ap_ $(_ABS_DIST)/gecko.apk && \ - $(ZIP) -j0 $(_ABS_DIST)/gecko.apk $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \ - cp $(_ABS_DIST)/gecko.apk $(_ABS_DIST)/gecko-unsigned-unaligned.apk && \ - $(RELEASE_JARSIGNER) $(_ABS_DIST)/gecko.apk && \ - $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE) + $(ZIP) -0 $(ABS_DIST)/gecko.ap_ $(OMNIJAR_DIR)$(OMNIJAR_NAME)) && \ + rm -f $(ABS_DIST)/gecko.apk && \ + cp $(ABS_DIST)/gecko.ap_ $(ABS_DIST)/gecko.apk && \ + $(ZIP) -j0 $(ABS_DIST)/gecko.apk $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \ + cp $(ABS_DIST)/gecko.apk $(ABS_DIST)/gecko-unsigned-unaligned.apk && \ + $(RELEASE_JARSIGNER) $(ABS_DIST)/gecko.apk && \ + $(ZIPALIGN) -f -v 4 $(ABS_DIST)/gecko.apk $(PACKAGE) ifeq ($(MOZ_BUILD_APP),mobile/android) INNER_MAKE_PACKAGE = \ $(INNER_SZIP_LIBRARIES) && \ make -C $(GECKO_APP_AP_PATH) gecko-nodeps.ap_ && \ - cp $(GECKO_APP_AP_PATH)/gecko-nodeps.ap_ $(_ABS_DIST)/gecko.ap_ && \ + cp $(GECKO_APP_AP_PATH)/gecko-nodeps.ap_ $(ABS_DIST)/gecko.ap_ && \ ( (test ! -f $(GECKO_APP_AP_PATH)/R.txt && echo "*** Warning: The R.txt that is being packaged might not agree with the R.txt that was built. This is normal during l10n repacks.") || \ diff $(GECKO_APP_AP_PATH)/R.txt $(GECKO_APP_AP_PATH)/gecko-nodeps/R.txt >/dev/null || \ (echo "*** Error: The R.txt that was built and the R.txt that is being packaged are not the same. Rebuild mobile/android/base and re-package." && exit 1)) && \ @@ -498,8 +497,8 @@ endif ifeq ($(MOZ_BUILD_APP),mobile/android/b2gdroid) INNER_MAKE_PACKAGE = \ $(INNER_SZIP_LIBRARIES) && \ - cp $(abspath $(DEPTH)/mobile/android/b2gdroid/app)/classes.dex $(_ABS_DIST)/classes.dex && \ - cp $(abspath $(DEPTH)/mobile/android/b2gdroid/app)/b2gdroid-unsigned-unaligned.apk $(_ABS_DIST)/gecko.ap_ && \ + cp $(abspath $(DEPTH)/mobile/android/b2gdroid/app)/classes.dex $(ABS_DIST)/classes.dex && \ + cp $(abspath $(DEPTH)/mobile/android/b2gdroid/app)/b2gdroid-unsigned-unaligned.apk $(ABS_DIST)/gecko.ap_ && \ $(INNER_MAKE_APK) endif @@ -526,17 +525,17 @@ 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); \ + 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)'; \ + 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)'; \ + 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; \ + 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 && \ @@ -556,7 +555,7 @@ 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' +MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd '$(ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i' endif endif diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in index 74d1d85db40c..2f0176a3ceac 100644 --- a/tools/update-packaging/Makefile.in +++ b/tools/update-packaging/Makefile.in @@ -35,7 +35,7 @@ full-update:: complete-patch ifeq ($(OS_TARGET), WINNT) MOZ_PKG_FORMAT := SFX7Z -UNPACKAGE = '$(subst $(DIST),$(_ABS_DIST),$(INSTALLER_PACKAGE))' +UNPACKAGE = '$(subst $(DIST),$(ABS_DIST),$(INSTALLER_PACKAGE))' ifdef AB_CD UNPACKAGE = '$(PACKAGE_BASE_DIR)/$(PACKAGE)' endif