From 6d614170cbfa958564eb5f824234ad5a9e484344 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 05:06:10 -0500 Subject: Revert "Add Basilisk" This reverts commit e72ef92b5bdc43cd2584198e2e54e951b70299e8. --- .../basilisk/config/mozconfigs/win64/add-on-devel | 9 -------- .../basilisk/config/mozconfigs/win64/artifact | 14 ----------- application/basilisk/config/mozconfigs/win64/beta | 15 ------------ application/basilisk/config/mozconfigs/win64/clang | 18 --------------- .../basilisk/config/mozconfigs/win64/clang-debug | 19 --------------- .../basilisk/config/mozconfigs/win64/common-opt | 24 ------------------- .../basilisk/config/mozconfigs/win64/common-win64 | 5 ---- application/basilisk/config/mozconfigs/win64/debug | 27 ---------------------- .../config/mozconfigs/win64/debug-artifact | 13 ----------- .../config/mozconfigs/win64/l10n-mozconfig | 20 ---------------- .../basilisk/config/mozconfigs/win64/nightly | 11 --------- .../basilisk/config/mozconfigs/win64/release | 22 ------------------ 12 files changed, 197 deletions(-) delete mode 100644 application/basilisk/config/mozconfigs/win64/add-on-devel delete mode 100644 application/basilisk/config/mozconfigs/win64/artifact delete mode 100644 application/basilisk/config/mozconfigs/win64/beta delete mode 100644 application/basilisk/config/mozconfigs/win64/clang delete mode 100644 application/basilisk/config/mozconfigs/win64/clang-debug delete mode 100644 application/basilisk/config/mozconfigs/win64/common-opt delete mode 100644 application/basilisk/config/mozconfigs/win64/common-win64 delete mode 100644 application/basilisk/config/mozconfigs/win64/debug delete mode 100644 application/basilisk/config/mozconfigs/win64/debug-artifact delete mode 100644 application/basilisk/config/mozconfigs/win64/l10n-mozconfig delete mode 100644 application/basilisk/config/mozconfigs/win64/nightly delete mode 100644 application/basilisk/config/mozconfigs/win64/release (limited to 'application/basilisk/config/mozconfigs/win64') diff --git a/application/basilisk/config/mozconfigs/win64/add-on-devel b/application/basilisk/config/mozconfigs/win64/add-on-devel deleted file mode 100644 index 47d0bf589..000000000 --- a/application/basilisk/config/mozconfigs/win64/add-on-devel +++ /dev/null @@ -1,9 +0,0 @@ -. $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/application/basilisk/config/mozconfigs/win64/artifact b/application/basilisk/config/mozconfigs/win64/artifact deleted file mode 100644 index 993424844..000000000 --- a/application/basilisk/config/mozconfigs/win64/artifact +++ /dev/null @@ -1,14 +0,0 @@ -MOZ_AUTOMATION_BUILD_SYMBOLS=0 -MOZ_AUTOMATION_L10N_CHECK=0 - -# Needed to set SourceRepository in application.ini (used by Talos) -export MOZILLA_OFFICIAL=1 - -. "$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" - -. "$topsrcdir/build/mozconfig.artifact" -ac_add_options --enable-artifact-build-symbols diff --git a/application/basilisk/config/mozconfigs/win64/beta b/application/basilisk/config/mozconfigs/win64/beta deleted file mode 100644 index 4a6fe7ebe..000000000 --- a/application/basilisk/config/mozconfigs/win64/beta +++ /dev/null @@ -1,15 +0,0 @@ -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.common.override" diff --git a/application/basilisk/config/mozconfigs/win64/clang b/application/basilisk/config/mozconfigs/win64/clang deleted file mode 100644 index 14f09b97a..000000000 --- a/application/basilisk/config/mozconfigs/win64/clang +++ /dev/null @@ -1,18 +0,0 @@ -MOZ_AUTOMATION_L10N_CHECK=0 -MOZ_AUTOMATION_PACKAGE_TEST=0 - -. "$topsrcdir/build/mozconfig.win-common" -. "$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-optimize - -ac_add_options --enable-clang-plugin - -. $topsrcdir/build/win64/mozconfig.vs-latest - -. "$topsrcdir/build/mozconfig.common.override" -. "$topsrcdir/build/mozconfig.cache" -. "$topsrcdir/build/mozconfig.clang-cl" diff --git a/application/basilisk/config/mozconfigs/win64/clang-debug b/application/basilisk/config/mozconfigs/win64/clang-debug deleted file mode 100644 index 5565578fb..000000000 --- a/application/basilisk/config/mozconfigs/win64/clang-debug +++ /dev/null @@ -1,19 +0,0 @@ -MOZ_AUTOMATION_L10N_CHECK=0 -MOZ_AUTOMATION_PACKAGE_TEST=0 - -. "$topsrcdir/build/mozconfig.win-common" -. "$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-optimize -ac_add_options --enable-debug - -ac_add_options --enable-clang-plugin - -. $topsrcdir/build/win64/mozconfig.vs-latest - -. "$topsrcdir/build/mozconfig.common.override" -. "$topsrcdir/build/mozconfig.cache" -. "$topsrcdir/build/mozconfig.clang-cl" diff --git a/application/basilisk/config/mozconfigs/win64/common-opt b/application/basilisk/config/mozconfigs/win64/common-opt deleted file mode 100644 index 40fba7f76..000000000 --- a/application/basilisk/config/mozconfigs/win64/common-opt +++ /dev/null @@ -1,24 +0,0 @@ -# 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/application/basilisk/config/mozconfigs/win64/common-win64 b/application/basilisk/config/mozconfigs/win64/common-win64 deleted file mode 100644 index 8f167cad1..000000000 --- a/application/basilisk/config/mozconfigs/win64/common-win64 +++ /dev/null @@ -1,5 +0,0 @@ -# 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/application/basilisk/config/mozconfigs/win64/debug b/application/basilisk/config/mozconfigs/win64/debug deleted file mode 100644 index 723fa0e0b..000000000 --- a/application/basilisk/config/mozconfigs/win64/debug +++ /dev/null @@ -1,27 +0,0 @@ -. "$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.common.override" -. "$topsrcdir/build/mozconfig.cache" diff --git a/application/basilisk/config/mozconfigs/win64/debug-artifact b/application/basilisk/config/mozconfigs/win64/debug-artifact deleted file mode 100644 index bb9dc9fa8..000000000 --- a/application/basilisk/config/mozconfigs/win64/debug-artifact +++ /dev/null @@ -1,13 +0,0 @@ -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" - -. "$topsrcdir/build/mozconfig.artifact" -ac_add_options --enable-artifact-build-symbols - -ac_add_options --enable-debug diff --git a/application/basilisk/config/mozconfigs/win64/l10n-mozconfig b/application/basilisk/config/mozconfigs/win64/l10n-mozconfig deleted file mode 100644 index 3b9b4af1c..000000000 --- a/application/basilisk/config/mozconfigs/win64/l10n-mozconfig +++ /dev/null @@ -1,20 +0,0 @@ -. "$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/application/basilisk/config/mozconfigs/win64/nightly b/application/basilisk/config/mozconfigs/win64/nightly deleted file mode 100644 index 395b5580d..000000000 --- a/application/basilisk/config/mozconfigs/win64/nightly +++ /dev/null @@ -1,11 +0,0 @@ -. "$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.common.override" -. "$topsrcdir/build/mozconfig.cache" diff --git a/application/basilisk/config/mozconfigs/win64/release b/application/basilisk/config/mozconfigs/win64/release deleted file mode 100644 index 9b38cf00d..000000000 --- a/application/basilisk/config/mozconfigs/win64/release +++ /dev/null @@ -1,22 +0,0 @@ -# This make file should be identical to the beta mozconfig, apart from the -# safeguard below - -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.common.override" -- cgit v1.2.3