[tor-commits] [tor-messenger-build/master] Factor out common mozconfigs

arlo at torproject.org arlo at torproject.org
Sat Nov 5 03:31:06 UTC 2016 

commit 7aa51976111e377db911b69ecf17053c67429eff
Author: Arlo Breault <arlolra at gmail.com>
Date:   Fri Nov 4 17:38:19 2016 -0700

    Factor out common mozconfigs
---
 projects/instantbird/build                  |  3 ++-
 projects/instantbird/config                 |  1 +
 projects/instantbird/mozconfig-common       | 21 +++++++++++++++++++++
 projects/instantbird/mozconfig-linux-i686   | 25 ++-----------------------
 projects/instantbird/mozconfig-linux-x86_64 | 24 ++----------------------
 projects/instantbird/mozconfig-osx-x86_64   | 27 ++-------------------------
 projects/instantbird/mozconfig-windows-i686 | 26 +++-----------------------
 7 files changed, 33 insertions(+), 94 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index 999c2a0..ca349ec 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -58,7 +58,8 @@ done
 
 echo '[% c("var/tormessenger_version") %]' > im/config/version.txt
 
-cp $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
+cp $rootdir/mozconfig-common .mozconfig
+cat $rootdir/[% c('input_files_by_name/mozconfig') %] >> .mozconfig
 echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version") %]' >> .mozconfig
 
 ./mozilla/mach build
diff --git a/projects/instantbird/config b/projects/instantbird/config
index d105f91..238042f 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -84,6 +84,7 @@ input_files:
   - filename: 0020-Trac-17480-Content-sink.patch
   - filename: 0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
   - filename: 0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
+  - filename: mozconfig-common
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig
   - name: mozilla
diff --git a/projects/instantbird/mozconfig-common b/projects/instantbird/mozconfig-common
new file mode 100644
index 0000000..5d5552e
--- /dev/null
+++ b/projects/instantbird/mozconfig-common
@@ -0,0 +1,21 @@
+no_tooltool=1
+
+ac_add_options --enable-application=im
+ac_add_options --enable-optimize
+ac_add_options --with-l10n-base=..
+ac_add_options --with-branding=im/branding/messenger
+
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-crashreporter
+ac_add_options --disable-webrtc
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+
+ac_add_options --enable-tor-browser-update
+ac_add_options --enable-update-channel=release
+ac_add_options --enable-update-packaging
+ac_add_options --enable-signmar
+ac_add_options --enable-verify-mar
+
+ac_add_options --disable-eme
+ac_add_options --disable-loop
diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686
index 34d7b81..748f937 100644
--- a/projects/instantbird/mozconfig-linux-i686
+++ b/projects/instantbird/mozconfig-linux-i686
@@ -1,5 +1,3 @@
-no_tooltool=1
-
 export CFLAGS="-m32 -gdwarf-2 -Wno-sign-compare"
 export CXXFLAGS="-m32 -gdwarf-2"
 export LDFLAGS=-m32
@@ -10,26 +8,7 @@ export ASFLAGS=-m32
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
-ac_add_options --with-ccache
-ac_add_options --enable-application=im
-ac_add_options --enable-optimize
-
-ac_add_options --with-l10n-base=..
-
 ac_add_options --host=i686-linux-gnu
-
-ac_add_options --with-branding=im/branding/messenger
-
-ac_add_options --disable-maintenance-service
-ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-
 ac_add_options --enable-default-toolkit=cairo-gtk2
-
-ac_add_options --enable-tor-browser-update
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-signmar
-ac_add_options --enable-verify-mar
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64
index 0264f8f..3540800 100644
--- a/projects/instantbird/mozconfig-linux-x86_64
+++ b/projects/instantbird/mozconfig-linux-x86_64
@@ -1,5 +1,3 @@
-no_tooltool=1
-
 export CFLAGS="-gdwarf-2 -Wno-sign-compare"
 export CXXFLAGS="-gdwarf-2"
 
@@ -7,24 +5,6 @@ export CXXFLAGS="-gdwarf-2"
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
-ac_add_options --with-ccache
-ac_add_options --enable-application=im
-ac_add_options --enable-optimize
-
-ac_add_options --with-l10n-base=..
-
-ac_add_options --with-branding=im/branding/messenger
-
-ac_add_options --disable-maintenance-service
-ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-
 ac_add_options --enable-default-toolkit=cairo-gtk2
-
-ac_add_options --enable-tor-browser-update
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-signmar
-ac_add_options --enable-verify-mar
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64
index 9eaed84..d9c8364 100644
--- a/projects/instantbird/mozconfig-osx-x86_64
+++ b/projects/instantbird/mozconfig-osx-x86_64
@@ -1,6 +1,4 @@
-CROSS_COMPILE=1
-
-no_tooltool=1
+export CROSS_COMPILE=1
 
 TOOLCHAIN_PREFIX="$ccbindir/x86_64-apple-darwin10-"
 CROSS_PRIVATE_FRAMEWORKS="$sysrootdir/System/Library/PrivateFrameworks"
@@ -9,28 +7,7 @@ FLAGS="-arch x86_64 -isysroot $sysrootdir"
 CC="$ccbindir/x86_64-apple-darwin10-clang $FLAGS"
 CXX="$ccbindir/x86_64-apple-darwin10-clang++ $FLAGS"
 
-ac_add_options --enable-application=im
-ac_add_options --enable-optimize
 ac_add_options --target=x86_64-apple-darwin10
-ac_add_options --enable-strip
 ac_add_options --with-macos-private-frameworks="$CROSS_PRIVATE_FRAMEWORKS"
-# Let's not compile EME at least until we can enable ClearKey and only Clearkey.
-# (Apart from that there is no Adobe CRM module for OS X right now)
-ac_add_options --disable-eme
-
-ac_add_options --with-l10n-base=..
-
-ac_add_options --with-branding=im/branding/messenger
-
-ac_add_options --disable-maintenance-service
-ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-
-ac_add_options --enable-tor-browser-update
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-signmar
-ac_add_options --enable-verify-mar
 ac_add_options --enable-tor-browser-data-outside-app-dir
+ac_add_options --enable-strip
diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686
index 71698ec..e9c3f3f 100644
--- a/projects/instantbird/mozconfig-windows-i686
+++ b/projects/instantbird/mozconfig-windows-i686
@@ -1,33 +1,13 @@
 export CROSS_COMPILE=1
 
-no_tooltool=1
-
 ac_add_options --target=i686-w64-mingw32
 ac_add_options --enable-default-toolkit=cairo-windows
 ac_add_options --enable-strip
 
-ac_add_options --enable-application=im
-ac_add_options --enable-optimize
-
-ac_add_options --with-l10n-base=..
-
-# sandbox currently fail to build with mingw, see trac 16010
-ac_add_options --disable-sandbox
-
 # ICU seems still to have cross-compiling issues:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19
 ac_add_options --without-intl-api
 
-ac_add_options --with-branding=im/branding/messenger
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-maintenance-service
-ac_add_options --disable-webrtc
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-
-ac_add_options --enable-tor-browser-update
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-signmar
-ac_add_options --enable-verify-mar
+# We can't build the sandbox code with mingw-w64:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426
+ac_add_options --disable-sandbox

More information about the tor-commits mailing list