Backed out changeset a95aada9a565 (bug 978211) under suspicion of bre…

…aking xpcshell tests on a CLOSED TREE

Makefile.in

@@ -250,26 +250,9 @@ MOZ_SOURCE_STAMP := $(MOZ_SOURCE_STAMP)
 export MOZ_SOURCE_STAMP
 endif
 
-.PHONY: update-packaging
 update-packaging:
 	$(MAKE) -C tools/update-packaging
 
-.PHONY: pretty-package
-pretty-package:
-	$(MAKE) package MOZ_PKG_PRETTYNAMES=1
-
-.PHONY: pretty-package-tests
-pretty-package-tests:
-	$(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
-
-.PHONY: pretty-l10n-check
-pretty-l10n-check:
-	$(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
-
-.PHONY: pretty-update-packaging
-pretty-update-packaging:
-	$(MAKE) -C tools/update-packaging 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_)

browser/config/mozconfigs/linux64/debug-nonunified

@@ -1,7 +1,3 @@
-MOZ_AUTOMATION_UPLOAD=0
-MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
-MOZ_AUTOMATION_CHECK=0
-
 . "$topsrcdir/browser/config/mozconfigs/linux64/debug"
 
 ac_add_options --disable-unified-compilation

browser/config/mozconfigs/linux64/nightly-nonunified

@@ -2,7 +2,6 @@ MOZ_AUTOMATION_UPLOAD=0
 MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
 MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 MOZ_AUTOMATION_CHECK=0
-MOZ_AUTOMATION_PRETTY=1
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
 

build/moz-automation.mk

@@ -22,34 +22,17 @@ AUTOMATION_UPLOAD_OUTPUT = $(DIST)/automation-upload.txt
 tier_BUILD_SYMBOLS = buildsymbols
 tier_CHECK = check
 tier_L10N_CHECK = l10n-check
-tier_PRETTY_L10N_CHECK = pretty-l10n-check
 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
 
 # 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 \
-  UPDATE_PACKAGING \
-  PRETTY_UPDATE_PACKAGING \
-  CHECK \
-  L10N_CHECK \
-  PRETTY_L10N_CHECK \
-  UPLOAD \
-  $(NULL)
+moz_automation_symbols = PACKAGE_TESTS BUILD_SYMBOLS UPLOAD_SYMBOLS PACKAGE UPDATE_PACKAGING CHECK L10N_CHECK UPLOAD
 MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$(MOZ_AUTOMATION_$(sym))),$(tier_$(sym))))
 
 # Dependencies between automation build steps
@@ -70,13 +53,6 @@ automation/upload: automation/update-packaging
 automation/package: automation/buildsymbols
 automation/check: automation/buildsymbols
 
-# The 'pretty' versions of targets run before the regular ones to avoid
-# conflicts in writing to the same files.
-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))
 	$(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) --upload-output $(AUTOMATION_UPLOAD_OUTPUT)
 

build/mozconfig.automation

@@ -19,15 +19,3 @@ mk_add_options "export MOZ_AUTOMATION_UNITTEST_SENDCHANGE=${MOZ_AUTOMATION_UNITT
 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}"
-
-    # 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