commit f49b8306354f68dcaf8efeec8a4bd8b5a8908e6b Author: Kathy Brade brade@pearlcrescent.com Date: Tue Sep 18 09:29:55 2018 -0400
Bug 27623: Export MOZILLA_OFFICIAL during desktop builds
This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. --- projects/firefox/mozconfig-linux-i686 | 1 + projects/firefox/mozconfig-linux-x86_64 | 1 + projects/firefox/mozconfig-osx-x86_64 | 1 + projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 5 files changed, 5 insertions(+)
diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index ec0adb9..ee5082a 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1
export CFLAGS=-m32 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 2e8e2fa..917e32c 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1
ac_add_options --enable-optimize diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 7ff17e1..5d56ad3 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -31,6 +31,7 @@ ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1
ac_add_options --enable-application=browser diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a5e15f1..07e8851 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1
ac_add_options --disable-debug diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index e7f857d..1665005 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1
ac_add_options --disable-debug