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/linux32/artifact | 10 +++++++++ .../basilisk/config/mozconfigs/linux32/beta | 15 ++++++++++++++ .../basilisk/config/mozconfigs/linux32/common-opt | 15 ++++++++++++++ .../basilisk/config/mozconfigs/linux32/debug | 24 ++++++++++++++++++++++ .../config/mozconfigs/linux32/debug-artifact | 12 +++++++++++ .../basilisk/config/mozconfigs/linux32/debug-asan | 23 +++++++++++++++++++++ .../config/mozconfigs/linux32/l10n-mozconfig | 20 ++++++++++++++++++ .../basilisk/config/mozconfigs/linux32/nightly | 15 ++++++++++++++ .../config/mozconfigs/linux32/nightly-asan | 22 ++++++++++++++++++++ .../basilisk/config/mozconfigs/linux32/release | 22 ++++++++++++++++++++ .../basilisk/config/mozconfigs/linux32/valgrind | 9 ++++++++ 11 files changed, 187 insertions(+) create mode 100644 application/basilisk/config/mozconfigs/linux32/artifact create mode 100644 application/basilisk/config/mozconfigs/linux32/beta create mode 100644 application/basilisk/config/mozconfigs/linux32/common-opt create mode 100644 application/basilisk/config/mozconfigs/linux32/debug create mode 100644 application/basilisk/config/mozconfigs/linux32/debug-artifact create mode 100644 application/basilisk/config/mozconfigs/linux32/debug-asan create mode 100644 application/basilisk/config/mozconfigs/linux32/l10n-mozconfig create mode 100644 application/basilisk/config/mozconfigs/linux32/nightly create mode 100644 application/basilisk/config/mozconfigs/linux32/nightly-asan create mode 100644 application/basilisk/config/mozconfigs/linux32/release create mode 100644 application/basilisk/config/mozconfigs/linux32/valgrind (limited to 'application/basilisk/config/mozconfigs/linux32') diff --git a/application/basilisk/config/mozconfigs/linux32/artifact b/application/basilisk/config/mozconfigs/linux32/artifact new file mode 100644 index 000000000..29eb8ba1c --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/artifact @@ -0,0 +1,10 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt" +. "$topsrcdir/build/mozconfig.common.override" + +ac_add_options --enable-artifact-builds +ac_add_options --enable-artifact-build-symbols +unset CC +unset CXX diff --git a/application/basilisk/config/mozconfigs/linux32/beta b/application/basilisk/config/mozconfigs/linux32/beta new file mode 100644 index 000000000..315c32b84 --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/beta @@ -0,0 +1,15 @@ +MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1} +if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then + MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1} + MOZ_AUTOMATION_UPDATE_PACKAGING=1 +fi + +. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt" + +ac_add_options --enable-official-branding +ac_add_options --enable-verify-mar + +mk_add_options MOZ_PGO=1 + +. "$topsrcdir/build/mozconfig.rust" +. "$topsrcdir/build/mozconfig.common.override" diff --git a/application/basilisk/config/mozconfigs/linux32/common-opt b/application/basilisk/config/mozconfigs/linux32/common-opt new file mode 100644 index 000000000..3bf3e530e --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/common-opt @@ -0,0 +1,15 @@ +# This file is sourced by nightly, beta, and release mozconfigs. + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-google-api-keyfile=/builds/gapi.data +ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key + +. $topsrcdir/build/unix/mozconfig.linux32 + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +export MOZ_TELEMETRY_REPORTING=1 + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 diff --git a/application/basilisk/config/mozconfigs/linux32/debug b/application/basilisk/config/mozconfigs/linux32/debug new file mode 100644 index 000000000..de97087d2 --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/debug @@ -0,0 +1,24 @@ +ac_add_options --enable-debug +ac_add_options --enable-dmd +ac_add_options --enable-verify-mar + +MOZ_AUTOMATION_L10N_CHECK=0 + +. $topsrcdir/build/unix/mozconfig.linux32 + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +#Use ccache + +# 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/linux32/debug-artifact b/application/basilisk/config/mozconfigs/linux32/debug-artifact new file mode 100644 index 000000000..3fc3faf89 --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/debug-artifact @@ -0,0 +1,12 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/build/unix/mozconfig.linux32" +. "$topsrcdir/build/mozconfig.common.override" + +ac_add_options --enable-artifact-builds +ac_add_options --enable-artifact-build-symbols +unset CC +unset CXX + +ac_add_options --enable-debug diff --git a/application/basilisk/config/mozconfigs/linux32/debug-asan b/application/basilisk/config/mozconfigs/linux32/debug-asan new file mode 100644 index 000000000..9fc7b9bff --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/debug-asan @@ -0,0 +1,23 @@ +# Use at least -O1 for optimization to avoid stack space +# exhaustions caused by Clang function inlining. +ac_add_options --enable-debug +ac_add_options --enable-optimize="-O1" + +# ASan specific options on Linux +ac_add_options --enable-valgrind + +. $topsrcdir/build/unix/mozconfig.asan + +export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig +. $topsrcdir/build/unix/mozconfig.gtk + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 + +# Need this to prevent name conflicts with the normal nightly build packages +export MOZ_PKG_SPECIAL=asan + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/application/basilisk/config/mozconfigs/linux32/l10n-mozconfig b/application/basilisk/config/mozconfigs/linux32/l10n-mozconfig new file mode 100644 index 000000000..ae7cc933b --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/l10n-mozconfig @@ -0,0 +1,20 @@ +no_sccache=1 + +ac_add_options --with-l10n-base=../../l10n +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --enable-official-branding + +. $topsrcdir/build/unix/mozconfig.linux32 + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +ac_add_options --disable-stdcxx-compat + +# 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/application/basilisk/config/mozconfigs/linux32/nightly b/application/basilisk/config/mozconfigs/linux32/nightly new file mode 100644 index 000000000..6d605ca7d --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/nightly @@ -0,0 +1,15 @@ +. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt" + + +ac_add_options --enable-verify-mar + +# This will overwrite the default of stripping everything and keep the symbol table. +# This is useful for profiling and debugging and only increases the package size +# by 2 MBs. +STRIP_FLAGS="--strip-debug" + +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/linux32/nightly-asan b/application/basilisk/config/mozconfigs/linux32/nightly-asan new file mode 100644 index 000000000..0930c184f --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/nightly-asan @@ -0,0 +1,22 @@ +# We still need to build with debug symbols +ac_add_options --disable-debug +ac_add_options --enable-optimize="-O2 -g" + +# ASan specific options on Linux +ac_add_options --enable-valgrind + +. $topsrcdir/build/unix/mozconfig.asan + +export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig +. $topsrcdir/build/unix/mozconfig.gtk + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Need this to prevent name conflicts with the normal nightly build packages +export MOZ_PKG_SPECIAL=asan + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/application/basilisk/config/mozconfigs/linux32/release b/application/basilisk/config/mozconfigs/linux32/release new file mode 100644 index 000000000..b17186666 --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/release @@ -0,0 +1,22 @@ +# 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=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1} + MOZ_AUTOMATION_UPDATE_PACKAGING=1 +fi + +. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt" + +ac_add_options --enable-official-branding +ac_add_options --enable-verify-mar + +mk_add_options MOZ_PGO=1 + +# 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" diff --git a/application/basilisk/config/mozconfigs/linux32/valgrind b/application/basilisk/config/mozconfigs/linux32/valgrind new file mode 100644 index 000000000..c8fb4f574 --- /dev/null +++ b/application/basilisk/config/mozconfigs/linux32/valgrind @@ -0,0 +1,9 @@ +. $topsrcdir/browser/config/mozconfigs/linux32/nightly + +ac_add_options --enable-valgrind +ac_add_options --disable-jemalloc +ac_add_options --disable-install-strip + +# Include the override mozconfig again (even though the above includes it) +# since it's supposed to override everything. +. "$topsrcdir/build/mozconfig.common.override" -- cgit v1.2.3