commit 70be56012287bf53920fbd4c0993062b8f6e0c41 Author: Erinn Clark <erinn@torproject.org> Date: Mon Nov 11 13:20:49 2013 -0200 Windows and Linux have been sharing their mozconfigs for too long. Break them out into OS/arch-specific mozconfigs. --- build-scripts/config/mozconfig-lin-i386 | 16 ++++++++++++++++ build-scripts/config/mozconfig-lin-x86_64 | 16 ++++++++++++++++ build-scripts/config/mozconfig-win | 16 ++++++++++++++++ build-scripts/linux-alpha.mk | 4 ++-- build-scripts/linux.mk | 4 ++-- build-scripts/windows-alpha.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 7 files changed, 56 insertions(+), 8 deletions(-) diff --git a/build-scripts/config/mozconfig-lin-i386 b/build-scripts/config/mozconfig-lin-i386 new file mode 100755 index 0000000..4421981 --- /dev/null +++ b/build-scripts/config/mozconfig-lin-i386 @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +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 --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/build-scripts/config/mozconfig-lin-x86_64 b/build-scripts/config/mozconfig-lin-x86_64 new file mode 100755 index 0000000..e71d8d2 --- /dev/null +++ b/build-scripts/config/mozconfig-lin-x86_64 @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +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 +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/build-scripts/config/mozconfig-win b/build-scripts/config/mozconfig-win new file mode 100755 index 0000000..e71d8d2 --- /dev/null +++ b/build-scripts/config/mozconfig-win @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +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 +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 813c228..bb459b6 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -89,8 +89,8 @@ ifeq ($(USE_OBFSPROXY),1) cd $(OBFSPROXY_DIR) && make install endif -build-firefox: config/dot_mozconfig $(FIREFOX_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: config/mozconfig-lin-$(ARCH_TYPE) $(FIREFOX_DIR) + cp config/mozconfig-lin-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(FIREFOX_DIR) && make -f client.mk build cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-* package INNER_MAKE_PACKAGE=true diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a922130..0f62c21 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -82,8 +82,8 @@ TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-lib build-pidgin: echo "We're not building pidgin yet!" -build-firefox: config/dot_mozconfig $(FIREFOX_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: config/mozconfig-lin-$(ARCH_TYPE) $(FIREFOX_DIR) + cp config/mozconfig-lin-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(FIREFOX_DIR) && make -f client.mk build cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-* package INNER_MAKE_PACKAGE=true diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 56233c4..fb41715 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -110,8 +110,8 @@ ifeq ($(USE_OBFSPROXY),1) cd $(OBFSPROXY_DIR) && make install endif -build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: $(FIREFOX_DIR) config/mozconfig-win $(MOZBUILD_DIR) + cp config/mozconfig-win $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)" touch $(STAMP_DIR)/build-firefox diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7480a4c..b5b9e50 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -100,8 +100,8 @@ TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin -build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: $(FIREFOX_DIR) config/mozconfig-win $(MOZBUILD_DIR) + cp config/mozconfig-win $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)" touch $(STAMP_DIR)/build-firefox