Bug 1507610 - Allow running find-dupes without all of MOZ_AUTOMATION r=mshal
authorEd Lee <edilee@mozilla.com>
Tue, 20 Nov 2018 19:35:08 +0000
changeset 504373 def0fd8429f9
parent 504372 c48931864919
child 504374 973e2824df96
child 504382 3214fd9390a0
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1507610
milestone65.0a1
first release with
nightly linux32
def0fd8429f9 / 65.0a1 / 20181125220116 / files
nightly linux64
def0fd8429f9 / 65.0a1 / 20181125220116 / files
nightly mac
def0fd8429f9 / 65.0a1 / 20181125220116 / files
nightly win32
def0fd8429f9 / 65.0a1 / 20181125220116 / files
nightly win64
def0fd8429f9 / 65.0a1 / 20181125220116 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1507610 - Allow running find-dupes without all of MOZ_AUTOMATION r=mshal Differential Revision: https://phabricator.services.mozilla.com/D12065
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -8,16 +8,20 @@ include $(MOZILLA_DIR)/toolkit/mozapps/i
 # 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
 
+ifdef MOZ_AUTOMATION
+RUN_FIND_DUPES ?= $(MOZ_AUTOMATION)
+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: multilocale.txt locale-manifest.in $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
 	OMNIJAR_NAME=$(OMNIJAR_NAME) \
 	NO_PKG_FILES="$(NO_PKG_FILES)" \
@@ -29,19 +33,19 @@ stage-package: multilocale.txt locale-ma
 		$(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)) \
 		$(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
 		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
-ifdef MOZ_AUTOMATION
+ifdef RUN_FIND_DUPES
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(MOZ_PKG_DIR)
-endif # MOZ_AUTOMATION
+endif # RUN_FIND_DUPES
 ifndef MOZ_IS_COMM_TOPDIR
 	# Package mozharness
 	$(call py_action,test_archive, \
 		mozharness \
 		$(ABS_DIST)/$(PKG_PATH)$(MOZHARNESS_PACKAGE))
 endif # MOZ_IS_COMM_TOPDIR
 ifdef MOZ_PACKAGE_JSSHELL
 	# Package JavaScript Shell