From a1be17c1cea81ebb1e8b131a662c698d78f3f7f2 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 4 Jun 2018 13:17:38 +0200 Subject: Issue #303 Part 1: Move basilisk files from /browser to /application/basilisk --- .../basilisk/config/mozconfigs/win32/add-on-devel | 9 ++++++++ .../basilisk/config/mozconfigs/win32/artifact | 10 +++++++++ application/basilisk/config/mozconfigs/win32/beta | 18 +++++++++++++++ .../basilisk/config/mozconfigs/win32/common-opt | 25 +++++++++++++++++++++ application/basilisk/config/mozconfigs/win32/debug | 26 ++++++++++++++++++++++ .../config/mozconfigs/win32/debug-artifact | 12 ++++++++++ .../config/mozconfigs/win32/debug-static-analysis | 19 ++++++++++++++++ .../config/mozconfigs/win32/l10n-mozconfig | 19 ++++++++++++++++ .../basilisk/config/mozconfigs/win32/nightly | 12 ++++++++++ .../basilisk/config/mozconfigs/win32/release | 24 ++++++++++++++++++++ 10 files changed, 174 insertions(+) create mode 100644 application/basilisk/config/mozconfigs/win32/add-on-devel create mode 100644 application/basilisk/config/mozconfigs/win32/artifact create mode 100644 application/basilisk/config/mozconfigs/win32/beta create mode 100644 application/basilisk/config/mozconfigs/win32/common-opt create mode 100644 application/basilisk/config/mozconfigs/win32/debug create mode 100644 application/basilisk/config/mozconfigs/win32/debug-artifact create mode 100644 application/basilisk/config/mozconfigs/win32/debug-static-analysis create mode 100644 application/basilisk/config/mozconfigs/win32/l10n-mozconfig create mode 100644 application/basilisk/config/mozconfigs/win32/nightly create mode 100644 application/basilisk/config/mozconfigs/win32/release (limited to 'application/basilisk/config/mozconfigs/win32') diff --git a/application/basilisk/config/mozconfigs/win32/add-on-devel b/application/basilisk/config/mozconfigs/win32/add-on-devel new file mode 100644 index 000000000..d84c1f5e4 --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/add-on-devel @@ -0,0 +1,9 @@ +. $topsrcdir/browser/config/mozconfigs/win32/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/application/basilisk/config/mozconfigs/win32/artifact b/application/basilisk/config/mozconfigs/win32/artifact new file mode 100644 index 000000000..888c99668 --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/artifact @@ -0,0 +1,10 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/build/win32/mozconfig.vs-latest" +. "$topsrcdir/build/mozconfig.common.override" + +ac_add_options --enable-artifact-builds +ac_add_options --enable-artifact-build-symbols diff --git a/application/basilisk/config/mozconfigs/win32/beta b/application/basilisk/config/mozconfigs/win32/beta new file mode 100644 index 000000000..cc14d6800 --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/beta @@ -0,0 +1,18 @@ +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/win32/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/application/basilisk/config/mozconfigs/win32/common-opt b/application/basilisk/config/mozconfigs/win32/common-opt new file mode 100644 index 000000000..816c8926a --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/common-opt @@ -0,0 +1,25 @@ +# 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/win32/mozconfig.vs-latest + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 diff --git a/application/basilisk/config/mozconfigs/win32/debug b/application/basilisk/config/mozconfigs/win32/debug new file mode 100644 index 000000000..815276d0f --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/debug @@ -0,0 +1,26 @@ +. "$topsrcdir/build/mozconfig.win-common" +MOZ_AUTOMATION_L10N_CHECK=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-verify-mar + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +. $topsrcdir/build/win32/mozconfig.vs-latest + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 + +ac_add_options --with-branding=browser/branding/nightly + +. "$topsrcdir/build/mozconfig.rust" + +. "$topsrcdir/build/mozconfig.common.override" +. "$topsrcdir/build/mozconfig.cache" diff --git a/application/basilisk/config/mozconfigs/win32/debug-artifact b/application/basilisk/config/mozconfigs/win32/debug-artifact new file mode 100644 index 000000000..5a31b8b3e --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/debug-artifact @@ -0,0 +1,12 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/build/win32/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/application/basilisk/config/mozconfigs/win32/debug-static-analysis b/application/basilisk/config/mozconfigs/win32/debug-static-analysis new file mode 100644 index 000000000..efc0820b5 --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/debug-static-analysis @@ -0,0 +1,19 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_PACKAGE_TESTS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/common" + +ac_add_options --enable-debug +ac_add_options --enable-dmd + +ac_add_options --enable-clang-plugin + +. $topsrcdir/build/win32/mozconfig.vs-latest + +. "$topsrcdir/build/mozconfig.rust" + +. "$topsrcdir/build/mozconfig.common.override" +. "$topsrcdir/build/mozconfig.cache" +. "$topsrcdir/build/mozconfig.clang-cl" diff --git a/application/basilisk/config/mozconfigs/win32/l10n-mozconfig b/application/basilisk/config/mozconfigs/win32/l10n-mozconfig new file mode 100644 index 000000000..d05067e03 --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/l10n-mozconfig @@ -0,0 +1,19 @@ +. "$topsrcdir/browser/config/mozconfigs/common" + +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/win32/mozconfig.vs-latest + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/application/basilisk/config/mozconfigs/win32/nightly b/application/basilisk/config/mozconfigs/win32/nightly new file mode 100644 index 000000000..210004905 --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/nightly @@ -0,0 +1,12 @@ +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win32/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/application/basilisk/config/mozconfigs/win32/release b/application/basilisk/config/mozconfigs/win32/release new file mode 100644 index 000000000..daaa45f89 --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/release @@ -0,0 +1,24 @@ +# 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/win32/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