From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- browser/config/mozconfigs/win64/add-on-devel | 9 ++++++++ browser/config/mozconfigs/win64/artifact | 11 ++++++++++ browser/config/mozconfigs/win64/beta | 19 +++++++++++++++++ browser/config/mozconfigs/win64/common-opt | 24 +++++++++++++++++++++ browser/config/mozconfigs/win64/common-win64 | 5 +++++ browser/config/mozconfigs/win64/debug | 29 ++++++++++++++++++++++++++ browser/config/mozconfigs/win64/debug-artifact | 13 ++++++++++++ browser/config/mozconfigs/win64/l10n-mozconfig | 20 ++++++++++++++++++ browser/config/mozconfigs/win64/nightly | 13 ++++++++++++ browser/config/mozconfigs/win64/release | 25 ++++++++++++++++++++++ 10 files changed, 168 insertions(+) create mode 100644 browser/config/mozconfigs/win64/add-on-devel create mode 100644 browser/config/mozconfigs/win64/artifact create mode 100644 browser/config/mozconfigs/win64/beta create mode 100644 browser/config/mozconfigs/win64/common-opt create mode 100644 browser/config/mozconfigs/win64/common-win64 create mode 100644 browser/config/mozconfigs/win64/debug create mode 100644 browser/config/mozconfigs/win64/debug-artifact create mode 100644 browser/config/mozconfigs/win64/l10n-mozconfig create mode 100644 browser/config/mozconfigs/win64/nightly create mode 100644 browser/config/mozconfigs/win64/release (limited to 'browser/config/mozconfigs/win64') diff --git a/browser/config/mozconfigs/win64/add-on-devel b/browser/config/mozconfigs/win64/add-on-devel new file mode 100644 index 000000000..47d0bf589 --- /dev/null +++ b/browser/config/mozconfigs/win64/add-on-devel @@ -0,0 +1,9 @@ +. $topsrcdir/browser/config/mozconfigs/win64/nightly + +#add-on signing is checked but not enforced +MOZ_REQUIRE_SIGNING=0 +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --enable-update-channel=default + +#Need this to prevent name conflicts with the normal nightly build packages +export MOZ_PKG_SPECIAL=add-on-devel diff --git a/browser/config/mozconfigs/win64/artifact b/browser/config/mozconfigs/win64/artifact new file mode 100644 index 000000000..ce6969667 --- /dev/null +++ b/browser/config/mozconfigs/win64/artifact @@ -0,0 +1,11 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/build/win64/mozconfig.vs-latest" +. "$topsrcdir/build/mozconfig.common.override" + +ac_add_options --enable-artifact-builds +ac_add_options --enable-artifact-build-symbols diff --git a/browser/config/mozconfigs/win64/beta b/browser/config/mozconfigs/win64/beta new file mode 100644 index 000000000..6fc4ebe36 --- /dev/null +++ b/browser/config/mozconfigs/win64/beta @@ -0,0 +1,19 @@ +MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1} + +if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then + MOZ_AUTOMATION_UPLOAD_SYMBOLS=1 + MOZ_AUTOMATION_UPDATE_PACKAGING=1 +fi + +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" +. "$topsrcdir/browser/config/mozconfigs/win64/common-opt" + +mk_add_options MOZ_PGO=1 + +ac_add_options --enable-official-branding +ac_add_options --enable-verify-mar + +. "$topsrcdir/build/mozconfig.rust" + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win64/common-opt b/browser/config/mozconfigs/win64/common-opt new file mode 100644 index 000000000..40fba7f76 --- /dev/null +++ b/browser/config/mozconfigs/win64/common-opt @@ -0,0 +1,24 @@ +# This file is sourced by the nightly, beta, and release mozconfigs. + +. "$topsrcdir/browser/config/mozconfigs/common" + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --enable-jemalloc +if [ -f /c/builds/gapi.data ]; then + _gapi_keyfile=c:/builds/gapi.data +else + _gapi_keyfile=e:/builds/gapi.data +fi +ac_add_options --with-google-api-keyfile=${_gapi_keyfile} + +ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +export MOZ_TELEMETRY_REPORTING=1 + +. $topsrcdir/build/win64/mozconfig.vs-latest + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win64/common-win64 b/browser/config/mozconfigs/win64/common-win64 new file mode 100644 index 000000000..8f167cad1 --- /dev/null +++ b/browser/config/mozconfigs/win64/common-win64 @@ -0,0 +1,5 @@ +# This file is used by all Win64 builds + +ac_add_options --target=x86_64-pc-mingw32 +ac_add_options --host=x86_64-pc-mingw32 + diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug new file mode 100644 index 000000000..db4eb5940 --- /dev/null +++ b/browser/config/mozconfigs/win64/debug @@ -0,0 +1,29 @@ +. "$topsrcdir/build/mozconfig.win-common" +MOZ_AUTOMATION_L10N_CHECK=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 +ac_add_options --enable-verify-mar + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 + +ac_add_options --with-branding=browser/branding/nightly + +. $topsrcdir/build/win64/mozconfig.vs-latest + +. "$topsrcdir/build/mozconfig.rust" + +. "$topsrcdir/build/mozconfig.common.override" +. "$topsrcdir/build/mozconfig.cache" diff --git a/browser/config/mozconfigs/win64/debug-artifact b/browser/config/mozconfigs/win64/debug-artifact new file mode 100644 index 000000000..bbba268fb --- /dev/null +++ b/browser/config/mozconfigs/win64/debug-artifact @@ -0,0 +1,13 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/build/win64/mozconfig.vs-latest" +. "$topsrcdir/build/mozconfig.common.override" + +ac_add_options --enable-artifact-builds +ac_add_options --enable-artifact-build-symbols + +ac_add_options --enable-debug diff --git a/browser/config/mozconfigs/win64/l10n-mozconfig b/browser/config/mozconfigs/win64/l10n-mozconfig new file mode 100644 index 000000000..3b9b4af1c --- /dev/null +++ b/browser/config/mozconfigs/win64/l10n-mozconfig @@ -0,0 +1,20 @@ +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-l10n-base=../../l10n +ac_add_options --with-windows-version=603 +ac_add_options --enable-official-branding + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. $topsrcdir/build/win64/mozconfig.vs-latest + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly new file mode 100644 index 000000000..aee22f1c0 --- /dev/null +++ b/browser/config/mozconfigs/win64/nightly @@ -0,0 +1,13 @@ +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" +. "$topsrcdir/browser/config/mozconfigs/win64/common-opt" + + +ac_add_options --enable-verify-mar + +ac_add_options --with-branding=browser/branding/nightly + +. "$topsrcdir/build/mozconfig.rust" + +. "$topsrcdir/build/mozconfig.common.override" +. "$topsrcdir/build/mozconfig.cache" diff --git a/browser/config/mozconfigs/win64/release b/browser/config/mozconfigs/win64/release new file mode 100644 index 000000000..62e83205f --- /dev/null +++ b/browser/config/mozconfigs/win64/release @@ -0,0 +1,25 @@ +# This make file should be identical to the beta mozconfig, apart from the +# safeguard below +MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1} + +if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then + MOZ_AUTOMATION_UPLOAD_SYMBOLS=1 + MOZ_AUTOMATION_UPDATE_PACKAGING=1 +fi + +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" +. "$topsrcdir/browser/config/mozconfigs/win64/common-opt" + +mk_add_options MOZ_PGO=1 + +ac_add_options --enable-official-branding +ac_add_options --enable-verify-mar + +# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in +# defines.sh during the beta cycle +export BUILDING_RELEASE=1 + +. "$topsrcdir/build/mozconfig.rust" + +. "$topsrcdir/build/mozconfig.common.override" -- cgit v1.2.3