Bug 1175895 - aid greppability of MOZ_AUTOMATION_*; r=ted
authorMike Shal <mshal@mozilla.com>
Wed, 17 Jun 2015 16:58:26 -0400
changeset 250950 77d5a7ca90c5b41830bcf60157a15c3154cd21e2
parent 250949 8353c823b8b5463c6c3b2c24437234755bf70fdd
child 250951 c28f6bfc72c166d23c42ead79a468a41ad001875
push id13813
push userryanvm@gmail.com
push dateWed, 01 Jul 2015 20:40:07 +0000
treeherderfx-team@14d26a6ef7a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1175895
milestone42.0a1
Bug 1175895 - aid greppability of MOZ_AUTOMATION_*; r=ted
build/moz-automation.mk
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -18,52 +18,52 @@ include $(topsrcdir)/toolkit/mozapps/ins
 DIST_FILES =
 
 # Log file from the 'make upload' step. We need this to parse out the URLs of
 # the uploaded files.
 AUTOMATION_UPLOAD_OUTPUT = $(DIST)/automation-upload.txt
 
 # Helper variables to convert from MOZ_AUTOMATION_* variables to the
 # corresponding the make target
-tier_BUILD_SYMBOLS = buildsymbols
-tier_L10N_CHECK = l10n-check
-tier_PRETTY_L10N_CHECK = pretty-l10n-check
-tier_INSTALLER = installer
-tier_PRETTY_INSTALLER = pretty-installer
-tier_PACKAGE = package
-tier_PRETTY_PACKAGE = pretty-package
-tier_PACKAGE_TESTS = package-tests
-tier_PRETTY_PACKAGE_TESTS = pretty-package-tests
-tier_UPDATE_PACKAGING = update-packaging
-tier_PRETTY_UPDATE_PACKAGING = pretty-update-packaging
-tier_UPLOAD_SYMBOLS = uploadsymbols
-tier_UPLOAD = upload
-tier_SDK = sdk
+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
+tier_MOZ_AUTOMATION_SDK = sdk
 
 # 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 = \
-  PACKAGE_TESTS \
-  PRETTY_PACKAGE_TESTS \
-  BUILD_SYMBOLS \
-  UPLOAD_SYMBOLS \
-  PACKAGE \
-  PRETTY_PACKAGE \
-  INSTALLER \
-  PRETTY_INSTALLER \
-  UPDATE_PACKAGING \
-  PRETTY_UPDATE_PACKAGING \
-  L10N_CHECK \
-  PRETTY_L10N_CHECK \
-  UPLOAD \
-  SDK \
+  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 \
+  MOZ_AUTOMATION_SDK \
   $(NULL)
-MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$(MOZ_AUTOMATION_$(sym))),$(tier_$(sym))))
+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