summaryrefslogtreecommitdiffstats
path: root/application/basilisk/config/mozconfigs/macosx-universal
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-02 05:06:10 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-02 05:06:10 -0500
commit6d614170cbfa958564eb5f824234ad5a9e484344 (patch)
tree3e1eb384382f30987cb2e64bd654afa8b74fd06b /application/basilisk/config/mozconfigs/macosx-universal
parent2a6b605d64b19411a300efdbbd7f78c349f90206 (diff)
downloadUXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar
UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.gz
UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.lz
UXP-6d614170cbfa958564eb5f824234ad5a9e484344.tar.xz
UXP-6d614170cbfa958564eb5f824234ad5a9e484344.zip
Revert "Add Basilisk"
This reverts commit e72ef92b5bdc43cd2584198e2e54e951b70299e8.
Diffstat (limited to 'application/basilisk/config/mozconfigs/macosx-universal')
-rw-r--r--application/basilisk/config/mozconfigs/macosx-universal/beta12
-rw-r--r--application/basilisk/config/mozconfigs/macosx-universal/common-opt18
-rw-r--r--application/basilisk/config/mozconfigs/macosx-universal/l10n-mozconfig22
-rw-r--r--application/basilisk/config/mozconfigs/macosx-universal/nightly20
-rw-r--r--application/basilisk/config/mozconfigs/macosx-universal/release19
5 files changed, 0 insertions, 91 deletions
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/beta b/application/basilisk/config/mozconfigs/macosx-universal/beta
deleted file mode 100644
index 894349b26..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/beta
+++ /dev/null
@@ -1,12 +0,0 @@
-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/macosx-universal/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/common-opt b/application/basilisk/config/mozconfigs/macosx-universal/common-opt
deleted file mode 100644
index 145d32fc9..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/common-opt
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of browser (bug 575283 comment 29)
-ac_add_options --enable-application=browser
-
-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
-
-# 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/macosx-universal/l10n-mozconfig b/application/basilisk/config/mozconfigs/macosx-universal/l10n-mozconfig
deleted file mode 100644
index 5ff95274f..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/macosx/mozconfig.common"
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-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/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/nightly b/application/basilisk/config/mozconfigs/macosx-universal/nightly
deleted file mode 100644
index e8280983e..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/nightly
+++ /dev/null
@@ -1,20 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --disable-install-strip
-ac_add_options --enable-verify-mar
-ac_add_options --enable-profiling
-ac_add_options --enable-instruments
-
-# Cross-universal builds fail when dtrace is enabled
-if test `uname -s` != Linux; then
- ac_add_options --enable-dtrace
-fi
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/application/basilisk/config/mozconfigs/macosx-universal/release b/application/basilisk/config/mozconfigs/macosx-universal/release
deleted file mode 100644
index 09da57c4f..000000000
--- a/application/basilisk/config/mozconfigs/macosx-universal/release
+++ /dev/null
@@ -1,19 +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=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
- MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-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"
-. "$topsrcdir/build/mozconfig.cache"