author | Mike Shal <mshal@mozilla.com> |
Thu, 03 Jul 2014 19:28:43 -0400 | |
changeset 195271 | cf02c8f760b17cc45f55254d46961d4e4795ba52 |
parent 195270 | fa68d4a514cda691ce68c1957fca105d0785690d |
child 195272 | fa90c963385bdf795d1f027f1cbbaf5893dd4aab |
push id | 46554 |
push user | mshal@mozilla.com |
push date | Mon, 21 Jul 2014 14:26:34 +0000 |
treeherder | mozilla-inbound@ade872c15c02 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 978211 |
milestone | 33.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
|
--- a/Makefile.in +++ b/Makefile.in @@ -265,16 +265,20 @@ pretty-package-tests: .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 +.PHONY: pretty-installer +pretty-installer: + $(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/browser/config/mozconfigs/win32/beta +++ b/browser/config/mozconfigs/win32/beta @@ -1,7 +1,8 @@ +. "$topsrcdir/build/mozconfig.win-common" . "$topsrcdir/browser/config/mozconfigs/win32/common-opt" mk_add_options MOZ_PGO=1 ac_add_options --enable-official-branding . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win32/debug +++ b/browser/config/mozconfigs/win32/debug @@ -1,8 +1,11 @@ +. "$topsrcdir/build/mozconfig.win-common" +MOZ_AUTOMATION_L10N_CHECK=0 +MOZ_AUTOMATION_TALOS_SENDCHANGE=0 . "$topsrcdir/browser/config/mozconfigs/common" ac_add_options --enable-debug ac_add_options --enable-dmd ac_add_options --enable-profiling # needed for --enable-dmd to work on Windows ac_add_options --enable-signmar ac_add_options --enable-require-all-d3dc-versions
--- a/browser/config/mozconfigs/win32/debug-nonunified +++ b/browser/config/mozconfigs/win32/debug-nonunified @@ -1,3 +1,9 @@ +. "$topsrcdir/build/mozconfig.win-common" +MOZ_AUTOMATION_CHECK=0 +MOZ_AUTOMATION_L10N_CHECK=0 +MOZ_AUTOMATION_TALOS_SENDCHANGE=0 +MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0 +MOZ_AUTOMATION_UPLOAD=0 . "$topsrcdir/browser/config/mozconfigs/win32/debug" ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/win32/nightly +++ b/browser/config/mozconfigs/win32/nightly @@ -1,8 +1,9 @@ +. "$topsrcdir/build/mozconfig.win-common" . "$topsrcdir/browser/config/mozconfigs/win32/common-opt" ac_add_options --enable-signmar ac_add_options --enable-profiling # Nightlies only since this has a cost in performance ac_add_options --enable-js-diagnostics
--- a/browser/config/mozconfigs/win32/nightly-nonunified +++ b/browser/config/mozconfigs/win32/nightly-nonunified @@ -1,3 +1,9 @@ +. "$topsrcdir/build/mozconfig.win-common" +MOZ_AUTOMATION_PRETTY=1 +MOZ_AUTOMATION_UPLOAD=0 +MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0 +MOZ_AUTOMATION_TALOS_SENDCHANGE=0 +MOZ_AUTOMATION_CHECK=0 . "$topsrcdir/browser/config/mozconfigs/win32/nightly" ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/win32/release +++ b/browser/config/mozconfigs/win32/release @@ -1,10 +1,11 @@ # This make file should be identical to the beta mozconfig, apart from the # safeguard below +. "$topsrcdir/build/mozconfig.win-common" . "$topsrcdir/browser/config/mozconfigs/win32/common-opt" mk_add_options MOZ_PGO=1 ac_add_options --enable-official-branding # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in # defines.sh during the beta cycle
--- a/browser/config/mozconfigs/win64/debug +++ b/browser/config/mozconfigs/win64/debug @@ -1,8 +1,11 @@ +. "$topsrcdir/build/mozconfig.win-common" +MOZ_AUTOMATION_L10N_CHECK=0 +MOZ_AUTOMATION_TALOS_SENDCHANGE=0 . "$topsrcdir/browser/config/mozconfigs/common" ac_add_options --target=x86_64-pc-mingw32 ac_add_options --host=x86_64-pc-mingw32 ac_add_options --enable-debug ac_add_options --enable-dmd ac_add_options --enable-profiling # needed for --enable-dmd to work on Windows
--- a/browser/config/mozconfigs/win64/nightly +++ b/browser/config/mozconfigs/win64/nightly @@ -1,8 +1,9 @@ +. "$topsrcdir/build/mozconfig.win-common" . "$topsrcdir/browser/config/mozconfigs/win64/common-win64" . "$topsrcdir/browser/config/mozconfigs/win64/common-opt" ac_add_options --enable-signmar ac_add_options --enable-profiling # Nightlies only since this has a cost in performance ac_add_options --enable-js-diagnostics
--- a/build/moz-automation.mk +++ b/build/moz-automation.mk @@ -18,16 +18,18 @@ include $(topsrcdir)/toolkit/mozapps/ins 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_CHECK = check 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 @@ -38,60 +40,72 @@ tier_UPLOAD = upload # 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 \ CHECK \ L10N_CHECK \ PRETTY_L10N_CHECK \ UPLOAD \ $(NULL) MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$(MOZ_AUTOMATION_$(sym))),$(tier_$(sym)))) # Dependencies between automation build steps automation/uploadsymbols: automation/buildsymbols automation/update-packaging: automation/package +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 -# automation/package and automation/check should depend on build (which is +# automation/{pretty-}package and automation/check 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/package: automation/buildsymbols +automation/pretty-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/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)) $(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) --upload-output $(AUTOMATION_UPLOAD_OUTPUT) # make check runs with the keep-going flag so we can see all the failures AUTOMATION_EXTRA_CMDLINE-check = -k # We need the log from make upload to grep it for urls in order to set # properties. AUTOMATION_EXTRA_CMDLINE-upload = 2>&1 | tee $(AUTOMATION_UPLOAD_OUTPUT) +# Note: We have to force -j1 here, at least until bug 1036563 is fixed. +AUTOMATION_EXTRA_CMDLINE-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 $(call BUILDSTATUS,TIER_START $1) @$(MAKE) $1 $(AUTOMATION_EXTRA_CMDLINE-$1)
--- a/build/mozconfig.automation +++ b/build/mozconfig.automation @@ -9,25 +9,27 @@ # package step will run. This file contains the default settings, which can be # overridden by setting them earlier in the appropriate mozconfig. mk_add_options "export MOZ_AUTOMATION_BUILD_SYMBOLS=${MOZ_AUTOMATION_BUILD_SYMBOLS-1}" mk_add_options "export MOZ_AUTOMATION_CHECK=${MOZ_AUTOMATION_CHECK-1}" 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_TALOS_SENDCHANGE=${MOZ_AUTOMATION_TALOS_SENDCHANGE-1}" mk_add_options "export MOZ_AUTOMATION_UNITTEST_SENDCHANGE=${MOZ_AUTOMATION_UNITTEST_SENDCHANGE-1}" 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
new file mode 100644 --- /dev/null +++ b/build/mozconfig.win-common @@ -0,0 +1,9 @@ +# 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/. + +if [ "x$IS_NIGHTLY" = "xyes" ]; then + MOZ_AUTOMATION_UPLOAD_SYMBOLS=1 + MOZ_AUTOMATION_UPDATE_PACKAGING=1 +fi +MOZ_AUTOMATION_INSTALLER=1