зеркало из https://github.com/mozilla/gecko-dev.git
Bug 978211 - Windows configs; r=glandium
This commit is contained in:
Mike Shal
Родитель
9fe91aeaea
Коммит
4dd3387350
|
|
@ -270,6 +270,10 @@ pretty-l10n-check:
|
|||
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_)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
|
||||
|
||||
mk_add_options MOZ_PGO=1
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
. "$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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
|
||||
|
||||
ac_add_options --enable-signmar
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
# 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
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
. "$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
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
|
||||
. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ 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
|
||||
|
|
@ -43,6 +45,8 @@ moz_automation_symbols = \
|
|||
UPLOAD_SYMBOLS \
|
||||
PACKAGE \
|
||||
PRETTY_PACKAGE \
|
||||
INSTALLER \
|
||||
PRETTY_INSTALLER \
|
||||
UPDATE_PACKAGING \
|
||||
PRETTY_UPDATE_PACKAGING \
|
||||
CHECK \
|
||||
|
|
@ -56,22 +60,29 @@ MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,
|
|||
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
|
||||
|
|
@ -87,6 +98,9 @@ AUTOMATION_EXTRA_CMDLINE-check = -k
|
|||
# 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.
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ 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}"
|
||||
|
|
@ -26,6 +27,7 @@ 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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Загрузка…
Ссылка в новой задаче