[Calendar:Lightning] Remove the last of mozinstaller except for what calendar needs to package.. Also make calendar package.

8 files changed, 0 insertions, 1123 deletions

diff --git a/system/installer/linux/rpm/mozilla.desktop b/system/installer/linux/rpm/mozilla.desktop
deleted file mode 100644
index f9f3bdc34..000000000
--- a/system/installer/linux/rpm/mozilla.desktop
+++ /dev/null
@@ -1,21 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-[Desktop Entry]
-Version=1.0
-Name=@MOZ_APP_DISPLAYNAME@
-GenericName=Web Browser
-Comment=Your web, the way you like it
-Exec=@MOZ_APP_NAME@
-Icon=@MOZ_APP_NAME@
-Terminal=false
-Type=Application
-StartupWMClass=@MOZ_APP_NAME@-bin
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-X-MultipleArgs=false
-X-Desktop-File-Install-Version=0.16
-Categories=Network;WebBrowser;
-Encoding=UTF-8
diff --git a/system/installer/linux/rpm/mozilla.spec b/system/installer/linux/rpm/mozilla.spec
deleted file mode 100644
index 90d132558..000000000
--- a/system/installer/linux/rpm/mozilla.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-%global __jar_repack %{nil}
-
-#Use a consistent string to refer to the package by
-%define pr_name "%{moz_app_displayname} %{moz_app_version}"
-
-Name:           %{moz_app_name}
-Version:        %{moz_numeric_app_version}
-Release:        %{?moz_rpm_release:%{moz_rpm_release}}%{?buildid:.%{buildid}}
-Summary:        %{pr_name}
-Group:          Applications/Internet
-License:        MPL 2
-Vendor:         Mozilla
-URL:            http://www.mozilla.org/projects/firefox/
-Source0:        %{name}.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#AutoProv:       no
-
-BuildRequires:  desktop-file-utils
-
-
-%description
-%{pr_name}.  This package was built from 
-%{moz_source_repo}/rev/%{moz_source_stamp}
-
-#We only want a subpackage for the SDK if the required
-#files were generated.  Like the tests subpackage, we
-#probably only need to conditionaly define the %files
-#section.
-%if %{?createdevel:1}
-%package devel
-Summary:    %{pr_name} SDK
-Group:      Development/Libraries
-requires:   %{name} = %{version}-%{release}
-%description devel
-%{pr_name} SDK libraries, headers and interface descriptions
-%endif
-
-%if %{?createtests:1}
-%package tests
-Summary:    %{pr_name} tests
-Group:      Developement/Libraries
-requires:   %{name} = %{version}-%{release}
-%description tests
-%{pr_name} test harness files and test cases
-%endif
-
-%prep
-echo No-op prep
-
-
-%build
-echo No-op build
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-validate %{SOURCE0}
-desktop-file-install --vendor mozilla \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    %{SOURCE0}
-#In order to make branding work in a generic way, We find
-#all the icons that are likely to be used for desktop files
-#and install them appropriately
-find %{moz_branding_directory} -name "default*.png" | tee icons.list
-for i in $(cat icons.list) ; do
-    size=$(echo $i | sed "s/.*default\([0-9]*\).png$/\1/")
-    icondir=$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${size}x${size}/apps/
-    mkdir -p $icondir
-    cp -a $i ${icondir}%{name}.png
-done
-rm icons.list #cleanup
-
-%if %{?createtests:1}
-#wastefully creates a zip file, but ensures that we stage all test suites
-make package-tests
-testdir=$RPM_BUILD_ROOT/%{_datadir}/%{_testsinstalldir}/tests
-mkdir -p $testdir
-cp -a dist/test-stage/* $testdir/
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-#this is needed to get gnome-panel to update the icons
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-    %{_bindir}/gtk-update-icon-cache --quiet ${_datadir}/icons/hicolor &> /dev/null || :
-fi
-
-
-%postun
-#this is needed to get gnome-panel to update the icons
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-    %{_bindir}/gtk-update-icon-cache --quiet ${_datadir}/icons/hicolor &> /dev/null || :
-fi
-
-
-%files
-%defattr(-,root,root,-)
-%{_installdir}
-%{_bindir}
-%{_datadir}/applications/
-%{_datadir}/icons/
-%doc
-
-
-%if %{?createdevel:1}
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}
-%{_sdkdir}
-%{_idldir}
-%endif
-
-
-%if %{?createtests:1}
-%files tests
-%{_datadir}/%{_testsinstalldir}/tests/
-%endif
-
-#%changelog
-#* %{name} %{version} %{moz_rpm_release}
-#- Please see %{moz_source_repo}/shortlog/%{moz_source_stamp}
diff --git a/system/installer/make-eme.mk b/system/installer/make-eme.mk
deleted file mode 100644
index 09e50a4ce..000000000
--- a/system/installer/make-eme.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(MOZILLA_DIR)/system/installer/signing.mk
-
-ifdef MOZ_SIGN_CMD
-  ifeq (,$(filter-out WINNT Darwin,$(OS_ARCH)))
-    # The first argument to this macro is the directory where the
-    # plugin-container binary exists, and the second is where voucher.bin will
-    # be generated. If the second argument is not specified, it defaults to the
-    # same as the first.
-    MAKE_SIGN_EME_VOUCHER = $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(1)/$(MOZ_CHILD_PROCESS_NAME) -output $(or $(2),$(1))/voucher.bin && \
-      $(MOZ_SIGN_CMD) -f emevoucher "$(or $(2),$(1))/voucher.bin"
-  endif
-endif
diff --git a/system/installer/package-name.mk b/system/installer/package-name.mk
deleted file mode 100644
index c3a7ba364..000000000
--- a/system/installer/package-name.mk
+++ /dev/null
@@ -1,160 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# assemble package names, see convention at
-# http://developer.mozilla.org/index.php?title=En/Package_Filename_Convention
-# for (at least Firefox) releases we use a different format with directories,
-# e.g. win32/de/Firefox Setup 3.0.1.exe
-# the latter format is triggered with MOZ_PKG_PRETTYNAMES=1
-
-ifndef PACKAGE_NAME_MK_INCLUDED
-PACKAGE_NAME_MK_INCLUDED := 1
-
-ifndef MOZ_PKG_VERSION
-# Normally MOZ_PKG_VERSION is set to the application version
-MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
-endif
-
-ifndef MOZ_PKG_PLATFORM
-MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU)
-
-# TARGET_OS/TARGET_CPU may be unintuitive, so we hardcode some special formats
-ifeq ($(OS_ARCH),WINNT)
-ifeq ($(TARGET_CPU),x86_64)
-MOZ_PKG_PLATFORM := win64
-else
-MOZ_PKG_PLATFORM := win32
-endif
-endif
-ifeq ($(OS_ARCH),Darwin)
-ifdef UNIVERSAL_BINARY
-MOZ_PKG_PLATFORM := mac
-else
-ifeq ($(TARGET_CPU),x86_64)
-MOZ_PKG_PLATFORM := mac64
-else
-MOZ_PKG_PLATFORM := mac
-endif
-endif
-endif
-ifeq ($(TARGET_OS),linux-gnu)
-MOZ_PKG_PLATFORM := linux-$(TARGET_CPU)
-endif
-endif #MOZ_PKG_PLATFORM
-
-ifdef MOZ_PKG_SPECIAL
-MOZ_PKG_PLATFORM := $(MOZ_PKG_PLATFORM)-$(MOZ_PKG_SPECIAL)
-endif
-
-MOZ_PKG_DIR = $(MOZ_APP_NAME)
-
-ifndef MOZ_PKG_PRETTYNAMES # standard package names
-
-ifndef MOZ_PKG_APPNAME
-MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
-endif
-
-ifdef MOZ_SIMPLE_PACKAGE_NAME
-PKG_BASENAME := $(MOZ_SIMPLE_PACKAGE_NAME)
-else
-PKG_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(MOZ_PKG_PLATFORM)
-endif
-PKG_PATH =
-SDK_PATH =
-PKG_INST_BASENAME = $(PKG_BASENAME).installer
-PKG_STUB_BASENAME = $(PKG_BASENAME).installer-stub
-PKG_INST_PATH = $(PKG_PATH)
-PKG_UPDATE_BASENAME = $(PKG_BASENAME)
-CHECKSUMS_FILE_BASENAME = $(PKG_BASENAME)
-MOZ_INFO_BASENAME = $(PKG_BASENAME)
-PKG_UPDATE_PATH = $(PKG_PATH)
-COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar
-# PARTIAL_MAR needs to be processed by $(wildcard) before you use it.
-PARTIAL_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).partial.*.mar
-PKG_LANGPACK_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).langpack
-PKG_LANGPACK_PATH = $(MOZ_PKG_PLATFORM)/xpi/
-LANGPACK = $(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
-PKG_SRCPACK_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).source
-PKG_BUNDLE_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION)
-PKG_SRCPACK_PATH =
-
-else # "pretty" release package names
-
-ifndef MOZ_PKG_APPNAME
-MOZ_PKG_APPNAME = $(MOZ_APP_DISPLAYNAME)
-endif
-MOZ_PKG_APPNAME_LC = $(shell echo $(MOZ_PKG_APPNAME) | tr '[A-Z]' '[a-z]')
-
-ifndef MOZ_PKG_LONGVERSION
-MOZ_PKG_LONGVERSION = $(MOZ_PKG_VERSION)
-endif
-
-ifeq (,$(filter-out Darwin, $(OS_ARCH))) # Mac
-PKG_BASENAME = $(MOZ_PKG_APPNAME) $(MOZ_PKG_LONGVERSION)
-PKG_INST_BASENAME = $(MOZ_PKG_APPNAME) Setup $(MOZ_PKG_LONGVERSION)
-else
-ifeq (,$(filter-out WINNT, $(OS_ARCH))) # Windows
-PKG_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
-PKG_INST_BASENAME = $(MOZ_PKG_APPNAME) Setup $(MOZ_PKG_LONGVERSION)
-PKG_STUB_BASENAME = $(MOZ_PKG_APPNAME) Setup Stub $(MOZ_PKG_LONGVERSION)
-else # unix (actually, not Windows, Mac or OS/2)
-PKG_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
-PKG_INST_BASENAME = $(MOZ_PKG_APPNAME_LC)-setup-$(MOZ_PKG_VERSION)
-endif
-endif
-PKG_PATH = $(MOZ_PKG_PLATFORM)/$(AB_CD)/
-SDK_PATH = $(PKG_PATH)/sdk/
-CHECKSUMS_FILE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
-MOZ_INFO_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
-PKG_INST_PATH = $(PKG_PATH)
-PKG_UPDATE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
-PKG_UPDATE_PATH = update/$(PKG_PATH)
-COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar
-# PARTIAL_MAR needs to be processed by $(wildcard) before you use it.
-PARTIAL_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).partial.*.mar
-PKG_LANGPACK_BASENAME = $(AB_CD)
-PKG_LANGPACK_PATH = $(MOZ_PKG_PLATFORM)/xpi/
-LANGPACK = $(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
-PKG_SRCPACK_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION).source
-PKG_BUNDLE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
-PKG_SRCPACK_PATH = source/
-
-endif # MOZ_PKG_PRETTYNAMES
-
-# Symbol package naming
-SYMBOL_FULL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols-full
-SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
-
-# Code coverage package naming
-CODE_COVERAGE_ARCHIVE_BASENAME = $(PKG_BASENAME).code-coverage-gcno
-
-# Test package naming
-TEST_PACKAGE = $(PKG_BASENAME).common.tests.zip
-CPP_TEST_PACKAGE = $(PKG_BASENAME).cppunittest.tests.zip
-XPC_TEST_PACKAGE = $(PKG_BASENAME).xpcshell.tests.zip
-MOCHITEST_PACKAGE = $(PKG_BASENAME).mochitest.tests.zip
-REFTEST_PACKAGE = $(PKG_BASENAME).reftest.tests.zip
-WP_TEST_PACKAGE = $(PKG_BASENAME).web-platform.tests.zip
-TALOS_PACKAGE = $(PKG_BASENAME).talos.tests.zip
-GTEST_PACKAGE = $(PKG_BASENAME).gtest.tests.zip
-
-ifneq (,$(wildcard $(DIST)/bin/application.ini))
-BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
-else
-BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
-endif
-
-MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
-MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
-MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).test_packages.json
-
-# JavaScript Shell
-ifdef MOZ_SIMPLE_PACKAGE_NAME
-JSSHELL_NAME := $(MOZ_SIMPLE_PACKAGE_NAME).jsshell.zip
-else
-JSSHELL_NAME = jsshell-$(MOZ_PKG_PLATFORM).zip
-endif
-PKG_JSSHELL = $(DIST)/$(JSSHELL_NAME)
-
-endif # PACKAGE_NAME_MK_INCLUDED
diff --git a/system/installer/packager-uxp.mk b/system/installer/packager-uxp.mk
deleted file mode 100644
index ed7ecf63d..000000000
--- a/system/installer/packager-uxp.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# We need to include the mozilla packaging routines because we are
-# very much still dependent on them
-include $(MOZILLA_DIR)/system/installer/packager.mk
-
-# This is currently only used on Windows, Linux, and Solaris
-# on other platforms such as Mac will fall back to the orginal
-# mozilla packaging
-make-archive:
-ifeq (,$(filter SunOS Linux WINNT,$(OS_ARCH)))
-	$(MAKE) make-package
-else
-	$(MAKE) stage-package make-buildinfo-file
-	@echo 'Compressing...'
-ifeq (WINNT,$(OS_ARCH))
-	cd $(DIST); $(CYGWIN_WRAPPER) 7z a -t7z -m0=lzma2 -mx=9 -aoa -bb3 $(PKG_BASENAME).7z $(MOZ_PKG_DIR)
-else
-	cd $(DIST); XZ_OPT=-9e $(TAR) cfJv $(PKG_BASENAME).tar.xz $(MOZ_PKG_DIR)
-endif
-endif
diff --git a/system/installer/packager.mk b/system/installer/packager.mk
deleted file mode 100644
index b9de42315..000000000
--- a/system/installer/packager.mk
+++ /dev/null
@@ -1,227 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(MOZILLA_DIR)/system/installer/package-name.mk
-include $(MOZILLA_DIR)/system/installer/upload-files.mk
-include $(MOZILLA_DIR)/system/installer/make-eme.mk
-
-# This is how we create the binary packages we release to the public.
-
-# browser/locales/Makefile uses this makefile for its variable defs, but
-# doesn't want the libs:: rule.
-ifndef PACKAGER_NO_LIBS
-libs:: make-package
-endif
-
-installer-stage: prepare-package
-ifndef MOZ_PKG_MANIFEST
-	$(error MOZ_PKG_MANIFEST unspecified!)
-endif
-	@rm -rf $(DEPTH)/installer-stage $(DIST)/xpt
-	@echo 'Staging installer files...'
-	@$(NSINSTALL) -D $(DEPTH)/installer-stage/core
-	@cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core
-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))
-
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-ELF_HACK_FLAGS = --fill
-endif
-export USE_ELF_HACK ELF_HACK_FLAGS
-
-# Override the value of OMNIJAR_NAME from config.status with the value
-# set earlier in this file.
-
-stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
-	OMNIJAR_NAME=$(OMNIJAR_NAME) \
-	NO_PKG_FILES="$(NO_PKG_FILES)" \
-	$(PYTHON) $(MOZILLA_DIR)/system/installer/packager.py $(DEFINES) $(ACDEFINES) \
-		--format $(MOZ_PACKAGER_FORMAT) \
-		$(addprefix --removals ,$(MOZ_PKG_REMOVALS)) \
-		$(if $(filter-out 0,$(MOZ_PKG_FATAL_WARNINGS)),,--ignore-errors) \
-		$(if $(MOZ_PACKAGER_MINIFY),--minify) \
-		$(if $(MOZ_PACKAGER_MINIFY_JS),--minify-js \
-		  $(addprefix --js-binary ,$(JS_BINARY)) \
-		) \
-		$(if $(JARLOG_DIR),$(addprefix --jarlog ,$(wildcard $(JARLOG_FILE_AB_CD)))) \
-		$(if $(OPTIMIZEJARS),--optimizejars) \
-		$(addprefix --compress ,$(JAR_COMPRESSION)) \
-		$(addprefix --unify ,$(UNIFY_DIST)) \
-		$(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
-		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
-	$(PYTHON) $(MOZILLA_DIR)/system/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)
-	@(cd $(DIST)/$(MOZ_PKG_DIR) && $(CREATE_PRECOMPLETE_CMD))
-ifdef MOZ_PACKAGE_JSSHELL
-	# Package JavaScript Shell
-	@echo 'Packaging JavaScript Shell...'
-	$(RM) $(PKG_JSSHELL)
-	$(MAKE_JSSHELL)
-endif # MOZ_PACKAGE_JSSHELL
-ifeq (Darwin, $(OS_ARCH))
-ifdef MOZ_ASAN
-	@echo "Rewriting ASan runtime dylib paths for all binaries in $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) ..."
-	$(PYTHON) $(MOZILLA_DIR)/build/unix/rewrite_asan_dylib.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
-endif # MOZ_ASAN
-endif # Darwin
-
-prepare-package: stage-package
-
-make-package-internal: prepare-package make-sourcestamp-file make-buildinfo-file
-	@echo 'Compressing...'
-	cd $(DIST) && $(MAKE_PACKAGE)
-
-make-package: FORCE
-	$(MAKE) make-package-internal
-	$(TOUCH) $@
-
-GARBAGE += make-package
-
-make-sourcestamp-file::
-	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
-	@echo '$(BUILDID)' > $(MOZ_SOURCESTAMP_FILE)
-ifdef MOZ_INCLUDE_SOURCE_INFO
-	@awk '$$2 == "MOZ_SOURCE_URL" {print $$3}' $(DEPTH)/source-repo.h >> $(MOZ_SOURCESTAMP_FILE)
-endif
-
-.PHONY: make-buildinfo-file
-make-buildinfo-file:
-	$(PYTHON) $(MOZILLA_DIR)/system/installer/informulate.py \
-		$(MOZ_BUILDINFO_FILE) \
-		BUILDID=$(BUILDID) \
-		$(addprefix MOZ_SOURCE_REPO=,MOZ_SOURCE_REPO=$(shell awk '$$2 == "MOZ_SOURCE_REPO" {print $$3}' $(DEPTH)/source-repo.h)) \
-		MOZ_SOURCE_STAMP=$(shell awk '$$2 == "MOZ_SOURCE_STAMP" {print $$3}' $(DEPTH)/source-repo.h) \
-		MOZ_PKG_PLATFORM=$(MOZ_PKG_PLATFORM)
-
-# The install target will install the application to prefix/lib/appname-version
-# In addition if INSTALL_SDK is set, it will install the development headers,
-# libraries, and IDL files as follows:
-# dist/include -> prefix/include/appname-version
-# dist/idl -> prefix/share/idl/appname-version
-# dist/sdk/lib -> prefix/lib/appname-devel-version/lib
-# prefix/lib/appname-devel-version/* symlinks to the above directories
-install:: prepare-package
-ifeq ($(OS_ARCH),WINNT)
-	$(error "make install" is not supported on this platform. Use "make package" instead.)
-endif
-ifeq (bundle,$(MOZ_FS_LAYOUT))
-	$(error "make install" is not supported on this platform. Use "make package" instead.)
-endif
-	$(NSINSTALL) -D $(DESTDIR)$(installdir)
-	(cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DESTDIR)$(installdir) && tar -xf -)
-	$(NSINSTALL) -D $(DESTDIR)$(bindir)
-	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
-	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
-ifdef INSTALL_SDK # Here comes the hard part
-	$(NSINSTALL) -D $(DESTDIR)$(includedir)
-	(cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DESTDIR)$(includedir) && tar -xf -)
-	$(NSINSTALL) -D $(DESTDIR)$(idldir)
-	(cd $(DIST)/idl && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DESTDIR)$(idldir) && tar -xf -)
-# SDK directory is the libs + a bunch of symlinks
-	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
-	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
-	if test -f $(DIST)/include/xpcom-config.h; then \
-	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
-	fi
-	find $(DIST)/sdk -name '*.pyc' | xargs rm -f
-	(cd $(DIST)/sdk/lib && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
-	(cd $(DIST)/sdk/bin && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
-	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
-	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
-	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
-	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
-	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
-endif # INSTALL_SDK
-
-make-sdk:
-ifndef SDK_UNIFY
-	$(MAKE) stage-package UNIVERSAL_BINARY= STAGE_SDK=1 MOZ_PKG_DIR=sdk-stage
-endif
-	@echo 'Packaging SDK...'
-	$(RM) -rf $(DIST)/$(MOZ_APP_NAME)-sdk
-	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/bin
-ifdef SDK_UNIFY
-	(cd $(UNIFY_DIST)/sdk-stage && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -)
-else
-	(cd $(DIST)/sdk-stage && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -)
-endif
-	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin
-	(cd $(DIST)/host/bin && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin && tar -xf -)
-	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/sdk
-	find $(DIST)/sdk -name '*.pyc' | xargs rm -f
-	(cd $(DIST)/sdk && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -)
-	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/include
-	(cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/include && tar -xf -)
-	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/idl
-	(cd $(DIST)/idl && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/idl && tar -xf -)
-	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/lib
-# sdk/lib is the same as sdk/sdk/lib
-	(cd $(DIST)/sdk/lib && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/lib && tar -xf -)
-	$(NSINSTALL) -D $(DIST)/$(SDK_PATH)
-ifndef PKG_SKIP_STRIP
-	USE_ELF_HACK= $(PYTHON) $(MOZILLA_DIR)/system/installer/strip.py $(DIST)/$(MOZ_APP_NAME)-sdk
-endif
-	cd $(DIST) && $(MAKE_SDK)
-ifdef UNIFY_DIST
-ifndef SDK_UNIFY
-	$(MAKE) -C $(UNIFY_DIST)/.. sdk SDK_UNIFY=1
-endif
-endif
-
-checksum:
-	mkdir -p `dirname $(CHECKSUM_FILE)`
-	@$(PYTHON) $(MOZILLA_DIR)/build/checksums.py \
-		-o $(CHECKSUM_FILE) \
-		$(CHECKSUM_ALGORITHM_PARAM) \
-		-s $(call QUOTED_WILDCARD,$(DIST)) \
-		$(UPLOAD_FILES)
-	@echo 'CHECKSUM FILE START'
-	@cat $(CHECKSUM_FILE)
-	@echo 'CHECKSUM FILE END'
-	$(SIGN_CHECKSUM_CMD)
-
-
-upload: checksum
-	$(PYTHON) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
-		--package '$(PACKAGE)' \
-		--properties-file $(DIST)/mach_build_properties.json \
-		$(UPLOAD_FILES) \
-		$(CHECKSUM_FILES)
-
-# source-package creates a source tarball from the files in MOZ_PKG_SRCDIR,
-# which is either set to a clean checkout or defaults to $topsrcdir
-source-package:
-	@echo 'Generate the sourcestamp file'
-	# Make sure to have repository information available and then generate the
-	# sourcestamp file.
-	$(MAKE) -C $(DEPTH) 'source-repo.h'
-	$(MAKE) make-sourcestamp-file
-	@echo 'Packaging source tarball...'
-	# We want to include the sourcestamp file in the source tarball, so copy it
-	# in the root source directory. This is useful to enable telemetry submissions
-	# from builds made from the source package with the correct revision information.
-	# Don't bother removing it as this is only used by automation.
-	@cp $(MOZ_SOURCESTAMP_FILE) '$(MOZ_PKG_SRCDIR)/sourcestamp.txt'
-	$(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH)
-	(cd $(MOZ_PKG_SRCDIR) && $(CREATE_SOURCE_TAR) - ./ ) | xz -9e > $(SOURCE_TAR)
-
-hg-bundle:
-	$(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH)
-	$(CREATE_HG_BUNDLE_CMD)
-
-source-upload:
-	$(MAKE) upload UPLOAD_FILES='$(SOURCE_UPLOAD_FILES)' CHECKSUM_FILE='$(SOURCE_CHECKSUM_FILE)'
diff --git a/system/installer/signing.mk b/system/installer/signing.mk
deleted file mode 100644
index 0319e6983..000000000
--- a/system/installer/signing.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# We shouldn't sign the first pass of a PGO build
-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_EXTERNAL_SIGNING_FORMAT_STUB := sha2signcodestub
-SIGN_INCLUDES := \
-  '*.dll' \
-  '*.exe' \
-  $(NULL)
-
-SIGN_EXCLUDES := \
-  'D3DCompiler*.dll' \
-  'msvc*.dll' \
-  $(NULL)
-endif # Windows
-
-ifeq (Darwin, $(OS_ARCH))
-MOZ_INTERNAL_SIGNING_FORMAT := macapp
-MOZ_EXTERNAL_SIGNING_FORMAT :=
-endif # Darwin
-
-ifeq (linux-gnu,$(TARGET_OS))
-MOZ_EXTERNAL_SIGNING_FORMAT :=
-endif # Linux
-
-ifdef MOZ_ASAN
-MOZ_INTERNAL_SIGNING_FORMAT :=
-MOZ_EXTERNAL_SIGNING_FORMAT :=
-endif
-
-endif # MOZ_SIGN_CMD
-
-endif # MOZ_PROFILE_GENERATE
diff --git a/system/installer/upload-files.mk b/system/installer/upload-files.mk
deleted file mode 100644
index 4ee20d15a..000000000
--- a/system/installer/upload-files.mk
+++ /dev/null
@@ -1,501 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifndef MOZ_PKG_FORMAT
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-MOZ_PKG_FORMAT  = DMG
-else
-ifeq (,$(filter-out WINNT, $(OS_ARCH)))
-MOZ_PKG_FORMAT  = ZIP
-else
-ifeq (,$(filter-out SunOS, $(OS_ARCH)))
-   MOZ_PKG_FORMAT  = BZ2
-else
-   ifeq (,$(filter-out gtk2 gtk3 qt, $(MOZ_WIDGET_TOOLKIT)))
-      MOZ_PKG_FORMAT  = BZ2
-   else
-      MOZ_PKG_FORMAT = TGZ
-   endif
-endif
-endif
-endif
-endif # MOZ_PKG_FORMAT
-
-ifeq ($(OS_ARCH),WINNT)
-INSTALLER_DIR   = windows
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-ifndef _APPNAME
-_APPNAME = $(MOZ_MACBUNDLE_NAME)
-endif
-ifndef _BINPATH
-_BINPATH = /$(_APPNAME)/Contents/MacOS
-endif # _BINPATH
-ifndef _RESPATH
-# Resource path for the precomplete file
-_RESPATH = /$(_APPNAME)/Contents/Resources
-endif
-ifdef UNIVERSAL_BINARY
-STAGEPATH = universal/
-endif
-endif
-
-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,
-# but on mac it is a .tar.bz2
-SDK_SUFFIX    = $(PKG_SUFFIX)
-SDK           = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX)
-ifdef UNIVERSAL_BINARY
-SDK           = $(SDK_PATH)$(PKG_BASENAME)-$(TARGET_CPU).sdk$(SDK_SUFFIX)
-endif
-
-# JavaScript Shell packaging
-JSSHELL_BINS  = \
-  js$(BIN_SUFFIX) \
-  $(DLL_PREFIX)mozglue$(DLL_SUFFIX) \
-  $(NULL)
-
-ifdef MOZ_FOLD_LIBS
-  JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-else
-  JSSHELL_BINS += \
-    $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
-    $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
-    $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
-    $(NULL)
-endif # MOZ_FOLD_LIBS
-
-ifdef MSVC_C_RUNTIME_DLL
-  JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
-endif
-ifdef MSVC_CXX_RUNTIME_DLL
-  JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
-endif
-
-ifdef WIN_UCRT_REDIST_DIR
-  JSSHELL_BINS += $(notdir $(wildcard $(DIST)/bin/api-ms-win-*.dll))
-  JSSHELL_BINS += ucrtbase.dll
-endif
-
-MAKE_JSSHELL  = $(call py_action,zip,-C $(DIST)/bin $(abspath $(PKG_JSSHELL)) $(JSSHELL_BINS))
-
-JARLOG_DIR = $(topobjdir)/jarlog/
-JARLOG_FILE_AB_CD = $(JARLOG_DIR)/$(AB_CD).log
-
-TAR_CREATE_FLAGS := --exclude=.mkdir.done $(TAR_CREATE_FLAGS)
-CREATE_FINAL_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \
-  --mode=go-w --exclude=.mkdir.done -f
-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)'
-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)'
-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)'
-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)
-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)
-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.]*//' )
-
-  RPMBUILD_TOPDIR=$(ABS_DIST)/rpmbuild
-  RPMBUILD_RPMDIR=$(ABS_DIST)
-  RPMBUILD_SRPMDIR=$(ABS_DIST)
-  RPMBUILD_SOURCEDIR=$(RPMBUILD_TOPDIR)/SOURCES
-  RPMBUILD_SPECDIR=$(topsrcdir)/system/installer/linux/rpm
-  RPMBUILD_BUILDDIR=$(ABS_DIST)/..
-
-  SPEC_FILE = $(RPMBUILD_SPECDIR)/mozilla.spec
-  RPM_INCIDENTALS=$(topsrcdir)/system/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)'
-
-  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
-
-  #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 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)
-
-endif #Create an RPM file
-
-
-ifeq ($(MOZ_PKG_FORMAT),APK)
-include $(MOZILLA_DIR)/system/installer/upload-files-$(MOZ_PKG_FORMAT).mk
-endif
-
-ifeq ($(MOZ_PKG_FORMAT),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)'
-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
-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))
-endif
-
-ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
-  ifeq (Darwin, $(OS_ARCH))
-    MAKE_PACKAGE    = $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS,$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)),true) \
-                      && (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)
-endif
-
-ifdef MOZ_SIGN_PACKAGE_CMD
-  MAKE_PACKAGE    += && $(MOZ_SIGN_PACKAGE_CMD) '$(PACKAGE)'
-endif
-
-ifdef MOZ_SIGN_CMD
-  MAKE_SDK           += && $(MOZ_SIGN_CMD) -f gpg '$(SDK)'
-endif
-
-NO_PKG_FILES += \
-	core \
-	bsdecho \
-	js \
-	js-config \
-	jscpucfg \
-	nsinstall \
-	viewer \
-	TestGtkEmbed \
-	elf-dynstr-gc \
-	mangle* \
-	maptsv* \
-	mfc* \
-	msdump* \
-	msmap* \
-	nm2tsv* \
-	nsinstall* \
-	res/samples \
-	res/throbber \
-	shlibsign* \
-	certutil* \
-	pk12util* \
-	BadCertServer* \
-	OCSPStaplingServer* \
-	GenerateOCSPResponse* \
-	chrome/chrome.rdf \
-	chrome/app-chrome.manifest \
-	chrome/overlayinfo \
-	components/compreg.dat \
-	components/xpti.dat \
-	content_unit_tests \
-	necko_unit_tests \
-	*.dSYM \
-	$(NULL)
-
-# 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*
-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/
-else
-  DEFINES += -DDIR_MACOS= -DDIR_RESOURCES=
-endif
-
-ifdef MOZ_FOLD_LIBS
-  DEFINES += -DMOZ_FOLD_LIBS=1
-endif
-
-GARBAGE		+= $(DIST)/$(PACKAGE) $(PACKAGE)
-
-# The following target stages files into two directories: one directory for
-# core files, and one for optional extensions based on the information in
-# the MOZ_PKG_MANIFEST file.
-
-PKG_ARG = , '$(pkg)'
-
-# MOZ_PKG_MANIFEST is the canonical way to define the package manifest (which
-# the packager will preprocess), but for a smooth transition, we derive it
-# 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
-endif # MOZ_PKG_MANIFEST
-
-ifndef MOZ_PACKAGER_FORMAT
-  MOZ_PACKAGER_FORMAT = $(error MOZ_PACKAGER_FORMAT is not set)
-endif
-
-# We optimize jars on all supported OS-es
-OPTIMIZEJARS = 1
-
-# A js binary is needed to perform verification of JavaScript minification.
-# We can only use the built binary when not cross-compiling. Environments
-# (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
-endif
-
-ifeq ($(OS_TARGET), WINNT)
-  INSTALLER_PACKAGE = $(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
-endif
-
-# These are necessary because some of our packages/installers contain spaces
-# in their filenames and GNU Make's $(wildcard) function doesn't properly
-# deal with them.
-empty :=
-space = $(empty) $(empty)
-QUOTED_WILDCARD = $(if $(wildcard $(subst $(space),?,$(1))),'$(1)')
-ESCAPE_SPACE = $(subst $(space),\$(space),$(1))
-ESCAPE_WILDCARD = $(subst $(space),?,$(1))
-
-# This variable defines which OpenSSL algorithm to use to
-# generate checksums for files that we upload
-CHECKSUM_ALGORITHM_PARAM = -d sha512 -d md5 -d sha1
-
-# This variable defines where the checksum file will be located
-CHECKSUM_FILE = '$(DIST)/$(PKG_PATH)/$(CHECKSUMS_FILE_BASENAME).checksums'
-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
-endif
-
-UPLOAD_FILES= \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(LANGPACK)) \
-  $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR))) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(CPP_TEST_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(XPC_TEST_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(MOCHITEST_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TALOS_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(REFTEST_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(WP_TEST_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(GTEST_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(SDK).asc) \
-  $(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \
-  $(call QUOTED_WILDCARD,$(MOZ_BUILDINFO_FILE)) \
-  $(call QUOTED_WILDCARD,$(MOZ_TEST_PACKAGES_FILE)) \
-  $(call QUOTED_WILDCARD,$(PKG_JSSHELL)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip) \
-  $(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
-
-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)
-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)
-
-  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
-
-ifndef MOZ_PKG_SRCDIR
-  MOZ_PKG_SRCDIR = $(topsrcdir)
-endif
-
-SRC_TAR_PREFIX = $(MOZ_APP_NAME)-$(MOZ_PKG_VERSION)
-SRC_TAR_EXCLUDE_PATHS += \
-  --exclude='.hg*' \
-  --exclude='CVS' \
-  --exclude='.cvs*' \
-  --exclude='.mozconfig*' \
-  --exclude='*.pyc' \
-  --exclude='$(MOZILLA_DIR)/Makefile' \
-  --exclude='$(MOZILLA_DIR)/dist'
-ifdef 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
-
-SOURCE_TAR = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_SRCPACK_BASENAME).tar.xz
-HG_BUNDLE_FILE = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_BUNDLE_BASENAME).bundle
-SOURCE_CHECKSUM_FILE = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_SRCPACK_BASENAME).checksums
-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)
-endif
-CREATE_HG_BUNDLE_CMD += $(HG_BUNDLE_FILE)
-ifdef UPLOAD_HG_BUNDLE
-  SOURCE_UPLOAD_FILES  += $(HG_BUNDLE_FILE)
-endif