Bug 1329355 - Remove MOZ_AUTOMATION_PRETTY*; r=ted
authorMike Shal <mshal@mozilla.com>
Tue, 10 Jan 2017 11:07:13 -0500
changeset 342646 68d491c00355a801f849d591f4bcb17103f5dc93
parent 342645 35da3357c5067f71891dbbd7942ce0b1fa12a0d7
child 342647 318f1bcd336e8bf83ca1ad9b01236008e69034a2
push id86923
push userkwierso@gmail.com
push dateTue, 14 Feb 2017 01:07:39 +0000
treeherdermozilla-inbound@5a7f8a39068a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1329355, 1121000
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1329355 - Remove MOZ_AUTOMATION_PRETTY*; r=ted These automation steps are no longer relevant, since the last use of MOZ_AUTOMATION_PRETTY was removed along with non-unified builds in bug 1121000. MozReview-Commit-ID: 11VDu8pIs1p
Makefile.in
build/moz-automation.mk
build/mozconfig.automation
--- a/Makefile.in
+++ b/Makefile.in
@@ -337,36 +337,16 @@ ifdef SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
 	$(PYTHON) -u $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.py '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
 endif
 endif
 
 .PHONY: update-packaging
 update-packaging:
 	$(MAKE) -C tools/update-packaging
 
-.PHONY: pretty-package
-pretty-package:
-	unset MOZ_SIGN_CMD && $(MAKE) package MOZ_PKG_PRETTYNAMES=1
-
-.PHONY: pretty-package-tests
-pretty-package-tests:
-	unset MOZ_SIGN_CMD && $(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
-
-.PHONY: pretty-l10n-check
-pretty-l10n-check:
-	unset MOZ_SIGN_CMD && $(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
-
-.PHONY: pretty-update-packaging
-pretty-update-packaging:
-	unset MOZ_SIGN_CMD && $(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
-
-.PHONY: pretty-installer
-pretty-installer:
-	unset MOZ_SIGN_CMD && $(MAKE) installer MOZ_PKG_PRETTYNAMES=1
-
 #XXX: this is a hack, since we don't want to clobber for MSVC
 # PGO support, but we can't do this test in client.mk
 ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
 # No point in clobbering if PGO has been explicitly disabled.
 ifndef NO_PROFILE_GUIDED_OPTIMIZE
 maybe_clobber_profiledbuild: clean
 else
 maybe_clobber_profiledbuild:
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -18,96 +18,73 @@ include $(topsrcdir)/toolkit/mozapps/ins
 # Clear out DIST_FILES if it was set by upload-files.mk (for Android builds)
 DIST_FILES =
 endif
 
 # Helper variables to convert from MOZ_AUTOMATION_* variables to the
 # corresponding the make target
 tier_MOZ_AUTOMATION_BUILD_SYMBOLS = buildsymbols
 tier_MOZ_AUTOMATION_L10N_CHECK = l10n-check
-tier_MOZ_AUTOMATION_PRETTY_L10N_CHECK = pretty-l10n-check
 tier_MOZ_AUTOMATION_INSTALLER = installer
-tier_MOZ_AUTOMATION_PRETTY_INSTALLER = pretty-installer
 tier_MOZ_AUTOMATION_PACKAGE = package
-tier_MOZ_AUTOMATION_PRETTY_PACKAGE = pretty-package
 tier_MOZ_AUTOMATION_PACKAGE_TESTS = package-tests
-tier_MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS = pretty-package-tests
 tier_MOZ_AUTOMATION_UPDATE_PACKAGING = update-packaging
-tier_MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING = pretty-update-packaging
 tier_MOZ_AUTOMATION_UPLOAD_SYMBOLS = uploadsymbols
 tier_MOZ_AUTOMATION_UPLOAD = upload
 
 # Automation build steps. Everything in MOZ_AUTOMATION_TIERS also gets used in
 # TIERS for mach display. As such, the MOZ_AUTOMATION_TIERS are roughly sorted
 # here in the order that they will be executed (since mach doesn't know of the
 # dependencies between them).
 moz_automation_symbols = \
   MOZ_AUTOMATION_PACKAGE_TESTS \
-  MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS \
   MOZ_AUTOMATION_BUILD_SYMBOLS \
   MOZ_AUTOMATION_UPLOAD_SYMBOLS \
   MOZ_AUTOMATION_PACKAGE \
-  MOZ_AUTOMATION_PRETTY_PACKAGE \
   MOZ_AUTOMATION_INSTALLER \
-  MOZ_AUTOMATION_PRETTY_INSTALLER \
   MOZ_AUTOMATION_UPDATE_PACKAGING \
-  MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING \
   MOZ_AUTOMATION_L10N_CHECK \
-  MOZ_AUTOMATION_PRETTY_L10N_CHECK \
   MOZ_AUTOMATION_UPLOAD \
   $(NULL)
 MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$($(sym))),$(tier_$(sym))))
 
 # Dependencies between automation build steps
 automation/uploadsymbols: automation/buildsymbols
 
 automation/update-packaging: automation/package
 automation/update-packaging: automation/installer
-automation/pretty-update-packaging: automation/pretty-package
-automation/pretty-update-packaging: automation/pretty-installer
 
 automation/l10n-check: automation/package
 automation/l10n-check: automation/installer
-automation/pretty-l10n-check: automation/pretty-package
-automation/pretty-l10n-check: automation/pretty-installer
 
 automation/upload: automation/installer
 automation/upload: automation/package
 automation/upload: automation/package-tests
 automation/upload: automation/buildsymbols
 automation/upload: automation/update-packaging
 
 # buildsymbols will modify our test binaries, which can interfere with
 # packaging them. A finer-grained dependency can help performance here
 # once bug 1329020 is fixed.
-automation/pretty-package-tests: automation/buildsymbols
+automation/package-tests: automation/buildsymbols
 
-# automation/{pretty-}package should depend on build (which is implicit due to
-# the way client.mk invokes automation/build), but buildsymbols changes the
+# automation/package should depend on build (which is implicit due to the way
+# client.mk invokes automation/build), but buildsymbols changes the
 # binaries/libs, and that's what we package/test.
-automation/pretty-package: automation/buildsymbols
+automation/package: automation/buildsymbols
 
 # The installer and packager all run stage-package, and may conflict
 # with each other.
 automation/installer: automation/package
 
-# The 'pretty' versions of targets run before the regular ones to avoid
-# conflicts in writing to the same files.
-automation/installer: automation/pretty-installer
-automation/package: automation/pretty-package
-automation/package-tests: automation/pretty-package-tests
-automation/l10n-check: automation/pretty-l10n-check
-automation/update-packaging: automation/pretty-update-packaging
-
 automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
 	@echo Automation steps completed.
 
 # Note: We have to force -j1 here, at least until bug 1036563 is fixed.
 AUTOMATION_EXTRA_CMDLINE-l10n-check = -j1
-AUTOMATION_EXTRA_CMDLINE-pretty-l10n-check = -j1
 
 # The commands only run if the corresponding MOZ_AUTOMATION_* variable is
 # enabled. This means, for example, if we enable MOZ_AUTOMATION_UPLOAD, then
 # 'buildsymbols' will only run if MOZ_AUTOMATION_BUILD_SYMBOLS is also set.
 # However, the target automation/buildsymbols will still be executed in this
 # case because it is a prerequisite of automation/upload.
 define automation_commands
 @+$(MAKE) $1 $(AUTOMATION_EXTRA_CMDLINE-$1)
--- a/build/mozconfig.automation
+++ b/build/mozconfig.automation
@@ -13,22 +13,9 @@ mk_add_options "export MOZ_AUTOMATION_BU
 mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
 mk_add_options "export MOZ_AUTOMATION_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
 mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
 mk_add_options "export MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
 mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
 
-# If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
-# stages.
-if test "$MOZ_AUTOMATION_PRETTY" = "1"; then
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
-
-    # Note that we always build the update packaging with pretty names even if
-    # we don't build it without, so this is set to 1.
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING=1"
-fi
-
 export MOZ_AUTOMATION_MOZCONFIG=1