diff options
Diffstat (limited to 'browser/config/mozconfigs/win32')
-rw-r--r-- | browser/config/mozconfigs/win32/add-on-devel | 10 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/beta | 7 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/common-opt | 22 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/common-win32 | 16 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/debug | 15 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/debug-fuzzing | 11 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/debug-static-analysis | 12 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/devedition | 10 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/l10n-mozconfig | 17 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/l10n-mozconfig-devedition | 17 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/mingwclang | 57 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/mingwclang-debug | 3 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/nightly | 7 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/noopt-debug | 9 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/profile-generate | 6 | ||||
-rw-r--r-- | browser/config/mozconfigs/win32/release | 7 |
16 files changed, 226 insertions, 0 deletions
diff --git a/browser/config/mozconfigs/win32/add-on-devel b/browser/config/mozconfigs/win32/add-on-devel new file mode 100644 index 0000000000..0491100a2d --- /dev/null +++ b/browser/config/mozconfigs/win32/add-on-devel @@ -0,0 +1,10 @@ +. $topsrcdir/browser/config/mozconfigs/win32/nightly + +#add-on signing is checked but not enforced +MOZ_REQUIRE_SIGNING= + +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/win32/beta b/browser/config/mozconfigs/win32/beta new file mode 100644 index 0000000000..9cb7047889 --- /dev/null +++ b/browser/config/mozconfigs/win32/beta @@ -0,0 +1,7 @@ +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win32/common-win32" +. "$topsrcdir/browser/config/mozconfigs/win32/common-opt" + +ac_add_options --enable-official-branding + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/common-opt b/browser/config/mozconfigs/win32/common-opt new file mode 100644 index 0000000000..adde1b2615 --- /dev/null +++ b/browser/config/mozconfigs/win32/common-opt @@ -0,0 +1,22 @@ +# 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} + +if test `uname -s` != Linux; then +APIKEYDIR="${APIKEYDIR:-${WORKSPACE}}" +else +APIKEYDIR="${APIKEYDIR:-/builds}" +fi + +ac_add_options --with-google-location-service-api-keyfile=${APIKEYDIR}/gls-gapi.data +ac_add_options --with-google-safebrowsing-api-keyfile=${APIKEYDIR}/sb-gapi.data + +ac_add_options --with-mozilla-api-keyfile=${APIKEYDIR}/mozilla-desktop-geoloc-api.key + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win32/common-win32 b/browser/config/mozconfigs/win32/common-win32 new file mode 100644 index 0000000000..bf75594aed --- /dev/null +++ b/browser/config/mozconfigs/win32/common-win32 @@ -0,0 +1,16 @@ +# This file is used by all Win32 builds + +ac_add_options --target=i686-pc-windows-msvc + +. $topsrcdir/build/win32/mozconfig.vs-latest + +if test `uname -s` = Linux; then + +# Configure expects executables for check_prog, so set the relevant files +# as executable on the first evaluation of the mozconfig where they exist. +export UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe" +if [ -f "${UPX}" ]; then + chmod +x "${UPX}" +fi + +fi diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug new file mode 100644 index 0000000000..2f0c2dc696 --- /dev/null +++ b/browser/config/mozconfigs/win32/debug @@ -0,0 +1,15 @@ +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win32/common-win32" + +ac_add_options --enable-debug + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 + +ac_add_options --with-branding=browser/branding/nightly + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/debug-fuzzing b/browser/config/mozconfigs/win32/debug-fuzzing new file mode 100644 index 0000000000..874661253a --- /dev/null +++ b/browser/config/mozconfigs/win32/debug-fuzzing @@ -0,0 +1,11 @@ +. "$topsrcdir/browser/config/mozconfigs/win32/debug" + +# Disable telemetry. All network activity is undesirable in fuzzing. +ac_add_options MOZ_TELEMETRY_REPORTING= + +ac_add_options --enable-fuzzing + +# Need this to prevent name conflicts with the normal nightly build packages +export MOZ_PKG_SPECIAL=fuzzing + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/debug-static-analysis b/browser/config/mozconfigs/win32/debug-static-analysis new file mode 100644 index 0000000000..ad046f27e2 --- /dev/null +++ b/browser/config/mozconfigs/win32/debug-static-analysis @@ -0,0 +1,12 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 + +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win32/common-win32" + +ac_add_options --enable-debug + +ac_add_options --enable-clang-plugin + +. "$topsrcdir/build/mozconfig.clang-cl" +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/devedition b/browser/config/mozconfigs/win32/devedition new file mode 100644 index 0000000000..fef90cab0e --- /dev/null +++ b/browser/config/mozconfigs/win32/devedition @@ -0,0 +1,10 @@ +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win32/common-win32" +. "$topsrcdir/browser/config/mozconfigs/win32/common-opt" + +# Add-on signing is not required for DevEdition +MOZ_REQUIRE_SIGNING= + +ac_add_options --with-branding=browser/branding/aurora + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig new file mode 100644 index 0000000000..2531cc233c --- /dev/null +++ b/browser/config/mozconfigs/win32/l10n-mozconfig @@ -0,0 +1,17 @@ +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win32/common-win32" +. "$topsrcdir/build/mozconfig.no-compile" + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --enable-official-branding + +ac_add_options --disable-nodejs +unset NODEJS + +export MOZILLA_OFFICIAL=1 + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig-devedition b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition new file mode 100644 index 0000000000..de54160e9b --- /dev/null +++ b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition @@ -0,0 +1,17 @@ +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win32/common-win32" +. "$topsrcdir/build/mozconfig.no-compile" + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-branding=browser/branding/aurora + +ac_add_options --disable-nodejs +unset NODEJS + +export MOZILLA_OFFICIAL=1 + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/mingwclang b/browser/config/mozconfigs/win32/mingwclang new file mode 100644 index 0000000000..00f74618f4 --- /dev/null +++ b/browser/config/mozconfigs/win32/mingwclang @@ -0,0 +1,57 @@ +# Sets: +# MOZ_AUTOMATION flags +# SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE - shouldn't be used? +. "$topsrcdir/build/mozconfig.win-common" + +# Sets: +# build/mozconfig.common +# AUTOCLOBBER=1 +# --enable-crashreporter +# --enable-release +# MOZ_ADDON_SIGNING +# MOZ_REQUIRE_SIGNING +# --enable-js-shell +# build/mozconfig.automation +# MOZ_AUTOMATION_ flags +. "$topsrcdir/browser/config/mozconfigs/common" + +export MOZ_PACKAGE_JSSHELL=1 + +# MinGW Stuff +ac_add_options --target=i686-pc-windows-gnu +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- + +ac_add_options --disable-warnings-as-errors +mk_add_options "export WIDL_TIME_OVERRIDE=0" + +# These replicate Tor's configuration +ac_add_options --enable-proxy-bypass-protection +ac_add_options --enable-disk-remnant-avoidance + +# These aren't supported on mingw at this time +ac_add_options --disable-webrtc # Bug 1393901 +ac_add_options --disable-geckodriver # Bug 1489320 +ac_add_options --disable-update-agent # Bug 1561797 +ac_add_options --disable-default-browser-agent # WinToast does not build on mingw +ac_add_options --disable-notification-server # Toast notifications don't build on mingw. + +# Find our toolchain +HOST_CC="$MOZ_FETCHES_DIR/clang/bin/clang" +HOST_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" +CC="$MOZ_FETCHES_DIR/clang/bin/i686-w64-mingw32-clang" +CXX="$MOZ_FETCHES_DIR/clang/bin/i686-w64-mingw32-clang++" +CXXFLAGS="-fms-extensions" +CFLAGS="$CFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}" +CXXFLAGS="$CXXFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}" +CFLAGS="$CFLAGS -include _mingw.h" +CXXFLAGS="$CXXFLAGS -include _mingw.h" + +# We want to make sure we use binutils and other binaries in the tooltool +# package. +mk_add_options "export PATH=$MOZ_FETCHES_DIR/clang/bin:$MOZ_FETCHES_DIR/upx/bin:$MOZ_FETCHES_DIR/fxc2/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH" + +# Do not include the visual studio related mozconfigs of course + +ac_add_options --with-branding=browser/branding/nightly + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/mingwclang-debug b/browser/config/mozconfigs/win32/mingwclang-debug new file mode 100644 index 0000000000..630dd5f6b7 --- /dev/null +++ b/browser/config/mozconfigs/win32/mingwclang-debug @@ -0,0 +1,3 @@ +. "$topsrcdir/browser/config/mozconfigs/win32/mingwclang" + +ac_add_options --enable-debug diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly new file mode 100644 index 0000000000..e53ce429c7 --- /dev/null +++ b/browser/config/mozconfigs/win32/nightly @@ -0,0 +1,7 @@ +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win32/common-win32" +. "$topsrcdir/browser/config/mozconfigs/win32/common-opt" + +ac_add_options --with-branding=browser/branding/nightly + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/noopt-debug b/browser/config/mozconfigs/win32/noopt-debug new file mode 100644 index 0000000000..d66c139354 --- /dev/null +++ b/browser/config/mozconfigs/win32/noopt-debug @@ -0,0 +1,9 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 + +# Developers often build with these options for a better debugging experience. +. "$topsrcdir/browser/config/mozconfigs/win32/debug" + +# We add this last to guard against inadvertent changes in the debug config. +# It may conflict with settings from mozconfig.override, but that seems +# unlikely. +ac_add_options --disable-optimize diff --git a/browser/config/mozconfigs/win32/profile-generate b/browser/config/mozconfigs/win32/profile-generate new file mode 100644 index 0000000000..bc29b253c0 --- /dev/null +++ b/browser/config/mozconfigs/win32/profile-generate @@ -0,0 +1,6 @@ +. $topsrcdir/browser/config/mozconfigs/win32/nightly + +mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0" + +ac_add_options --enable-profile-generate=cross +ac_add_options --disable-tests diff --git a/browser/config/mozconfigs/win32/release b/browser/config/mozconfigs/win32/release new file mode 100644 index 0000000000..9cb7047889 --- /dev/null +++ b/browser/config/mozconfigs/win32/release @@ -0,0 +1,7 @@ +. "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win32/common-win32" +. "$topsrcdir/browser/config/mozconfigs/win32/common-opt" + +ac_add_options --enable-official-branding + +. "$topsrcdir/build/mozconfig.common.override" |