Commit f49b8306 authored Sep 18, 2018 by Kathleen Brade

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.

parent 768e2c34

projects/firefox/mozconfig-linux-i686

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

projects/firefox/mozconfig-linux-x86_64

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

projects/firefox/mozconfig-osx-x86_64

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

projects/firefox/mozconfig-windows-i686

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

projects/firefox/mozconfig-windows-x86_64

+1 −0

Original line number	Diff line number	Diff line
		@@ -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