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 --- .../config/mozconfigs/macosx64/add-on-devel | 9 ++++++++ .../basilisk/config/mozconfigs/macosx64/artifact | 10 +++++++++ .../basilisk/config/mozconfigs/macosx64/debug | 24 ++++++++++++++++++++++ .../config/mozconfigs/macosx64/debug-artifact | 12 +++++++++++ .../basilisk/config/mozconfigs/macosx64/debug-asan | 20 ++++++++++++++++++ .../mozconfigs/macosx64/debug-static-analysis | 13 ++++++++++++ .../config/mozconfigs/macosx64/l10n-mozconfig | 12 +++++++++++ .../basilisk/config/mozconfigs/macosx64/nightly | 22 ++++++++++++++++++++ .../config/mozconfigs/macosx64/opt-static-analysis | 16 +++++++++++++++ 9 files changed, 138 insertions(+) create mode 100644 application/basilisk/config/mozconfigs/macosx64/add-on-devel create mode 100644 application/basilisk/config/mozconfigs/macosx64/artifact create mode 100644 application/basilisk/config/mozconfigs/macosx64/debug create mode 100644 application/basilisk/config/mozconfigs/macosx64/debug-artifact create mode 100644 application/basilisk/config/mozconfigs/macosx64/debug-asan create mode 100644 application/basilisk/config/mozconfigs/macosx64/debug-static-analysis create mode 100644 application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig create mode 100644 application/basilisk/config/mozconfigs/macosx64/nightly create mode 100644 application/basilisk/config/mozconfigs/macosx64/opt-static-analysis (limited to 'application/basilisk/config/mozconfigs/macosx64') diff --git a/application/basilisk/config/mozconfigs/macosx64/add-on-devel b/application/basilisk/config/mozconfigs/macosx64/add-on-devel new file mode 100644 index 000000000..e76df4dfa --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/add-on-devel @@ -0,0 +1,9 @@ +. $topsrcdir/browser/config/mozconfigs/macosx64/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/macosx64/artifact b/application/basilisk/config/mozconfigs/macosx64/artifact new file mode 100644 index 000000000..c25b21122 --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/artifact @@ -0,0 +1,10 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/build/macosx/mozconfig.common" +. "$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/macosx64/debug b/application/basilisk/config/mozconfigs/macosx64/debug new file mode 100644 index 000000000..4b052aa00 --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/debug @@ -0,0 +1,24 @@ +. $topsrcdir/build/macosx/mozconfig.common + +ac_add_options --enable-debug +ac_add_options --enable-dmd +ac_add_options --enable-verify-mar + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then +ac_add_options --with-macbundlename-prefix=Firefox +fi + +# 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/macosx64/debug-artifact b/application/basilisk/config/mozconfigs/macosx64/debug-artifact new file mode 100644 index 000000000..3afa8e4bf --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/debug-artifact @@ -0,0 +1,12 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/build/macosx/mozconfig.common" +. "$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/macosx64/debug-asan b/application/basilisk/config/mozconfigs/macosx64/debug-asan new file mode 100644 index 000000000..28d23798b --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/debug-asan @@ -0,0 +1,20 @@ +. $topsrcdir/build/unix/mozconfig.asan + +ac_add_options --enable-application=browser +ac_add_options --enable-debug +ac_add_options --enable-optimize="-O1" + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 + +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then +ac_add_options --with-macbundlename-prefix=Firefox +fi + +# 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/macosx64/debug-static-analysis b/application/basilisk/config/mozconfigs/macosx64/debug-static-analysis new file mode 100644 index 000000000..bb19af612 --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/debug-static-analysis @@ -0,0 +1,13 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_PACKAGE_TESTS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. $topsrcdir/build/macosx/mozconfig.common + +ac_add_options --enable-debug +ac_add_options --enable-dmd + +ac_add_options --enable-clang-plugin + +. "$topsrcdir/build/mozconfig.common.override" +. "$topsrcdir/build/mozconfig.cache" diff --git a/application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig b/application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig new file mode 100644 index 000000000..40ad84086 --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig @@ -0,0 +1,12 @@ +. "$topsrcdir/browser/config/mozconfigs/common" + +ac_add_options --with-l10n-base=../../l10n +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --enable-official-branding + +# 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" +. "$topsrcdir/build/mozconfig.cache" diff --git a/application/basilisk/config/mozconfigs/macosx64/nightly b/application/basilisk/config/mozconfigs/macosx64/nightly new file mode 100644 index 000000000..12fec0474 --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/nightly @@ -0,0 +1,22 @@ +. $topsrcdir/build/macosx/mozconfig.common + +ac_add_options --enable-verify-mar + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then +ac_add_options --with-macbundlename-prefix=Firefox +fi + +# 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/macosx64/opt-static-analysis b/application/basilisk/config/mozconfigs/macosx64/opt-static-analysis new file mode 100644 index 000000000..72ed3d6bd --- /dev/null +++ b/application/basilisk/config/mozconfigs/macosx64/opt-static-analysis @@ -0,0 +1,16 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_PACKAGE_TESTS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. $topsrcdir/build/macosx/mozconfig.common + +ac_add_options --disable-debug +ac_add_options --enable-optimize +ac_add_options --enable-dmd + +ac_add_options --enable-clang-plugin + +. "$topsrcdir/build/mozconfig.rust" +. "$topsrcdir/build/mozconfig.common.override" +. "$topsrcdir/build/mozconfig.cache" + -- cgit v1.2.3