commit 2d7cc73c208b0b3de88910e9feb9d3e4d1f03979 Author: Erinn Clark <erinn@torproject.org> Date: Fri Mar 16 02:17:29 2012 -0300 mozilla changed their default branding strategy again. temporarily enforce official branding, until our icons are ready. --- build-scripts/config/dot_mozconfig | 3 +++ build-scripts/config/mozconfig-osx-i386 | 3 +++ build-scripts/config/mozconfig-osx-x86_64 | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index 66196ae..c7eabd2 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -3,8 +3,11 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-official-branding ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 11a8789..e0d2187 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -1,6 +1,8 @@ # Options for client.mk. mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options AUTOCONF=autoconf213 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 # Options for cross-compilation on Snow Leopard. HOST_CC="gcc-4.2 -arch i386" @@ -19,6 +21,7 @@ ac_add_options --target=i386-apple-darwin$DARWIN_VERSION ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk ac_add_options --enable-macos-target=10.5 ac_add_options --enable-application=browser +ac_add_options --enable-official-branding ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-debug diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index febba50..5511829 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -14,6 +14,8 @@ CROSS_COMPILE=1 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk ac_add_options --target=x86_64-apple-darwin10.7.0 @@ -21,6 +23,7 @@ ac_add_options --enable-macos-target=10.6 # bug 491774. crashreporter won't build in cross compile ac_add_options --disable-crashreporter ac_add_options --enable-application=browser +ac_add_options --enable-official-branding ac_add_options --enable-libzul ac_add_options --enable-optimize ac_add_options --enable-strip