From f9cab004186edb425a9b88ad649726605080a17c Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Mon, 20 Apr 2020 20:49:37 -0700
Subject: move browser to webbrowser/

---
 webbrowser/config/mozconfigs/macosx-universal/beta    |  5 +++++
 .../config/mozconfigs/macosx-universal/common-opt     | 19 +++++++++++++++++++
 .../config/mozconfigs/macosx-universal/l10n-mozconfig | 11 +++++++++++
 webbrowser/config/mozconfigs/macosx-universal/release | 11 +++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 webbrowser/config/mozconfigs/macosx-universal/beta
 create mode 100644 webbrowser/config/mozconfigs/macosx-universal/common-opt
 create mode 100644 webbrowser/config/mozconfigs/macosx-universal/l10n-mozconfig
 create mode 100644 webbrowser/config/mozconfigs/macosx-universal/release

(limited to 'webbrowser/config/mozconfigs/macosx-universal')

diff --git a/webbrowser/config/mozconfigs/macosx-universal/beta b/webbrowser/config/mozconfigs/macosx-universal/beta
new file mode 100644
index 0000000..cc2f44d
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx-universal/beta
@@ -0,0 +1,5 @@
+. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
+
+ac_add_options --enable-official-branding
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/macosx-universal/common-opt b/webbrowser/config/mozconfigs/macosx-universal/common-opt
new file mode 100644
index 0000000..414f690
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx-universal/common-opt
@@ -0,0 +1,19 @@
+# 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 --enable-update-packaging
+ac_add_options --with-google-api-keyfile=/builds/gapi.data
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
diff --git a/webbrowser/config/mozconfigs/macosx-universal/l10n-mozconfig b/webbrowser/config/mozconfigs/macosx-universal/l10n-mozconfig
new file mode 100644
index 0000000..2f88f19
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -0,0 +1,11 @@
+. "$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-update-packaging
+ac_add_options --with-macbundlename-prefix=Firefox
+ac_add_options --with-ccache
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/webbrowser/config/mozconfigs/macosx-universal/release b/webbrowser/config/mozconfigs/macosx-universal/release
new file mode 100644
index 0000000..ab8a469
--- /dev/null
+++ b/webbrowser/config/mozconfigs/macosx-universal/release
@@ -0,0 +1,11 @@
+# This make file should be identical to the beta mozconfig, apart from the
+# safeguard below
+. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
+
+ac_add_options --enable-official-branding
+
+# 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