[tor-commits] [tor-messenger-build/master] Fetch version information for mozconfig from rbm.conf

[sukhbir at torproject.org]

commit 728c5c35cb21284658d9b6bd93553adf6e45b802
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Tue Aug 16 14:07:45 2016 -0400

    Fetch version information for mozconfig from rbm.conf
---
 projects/instantbird/build                  | 1 +
 projects/instantbird/mozconfig-linux-i686   | 1 -
 projects/instantbird/mozconfig-linux-x86_64 | 1 -
 projects/instantbird/mozconfig-osx-x86_64   | 1 -
 projects/instantbird/mozconfig-windows-i686 | 1 -
 5 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index 293fc07..8eb81e4 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -107,6 +107,7 @@ fi
 cd ..
 
 cp $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
+echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version") %]' >> .mozconfig
 ./mozilla/mach build || ./mozilla/mach build
 ./mozilla/mach package
 mv obj-*/dist/instantbird-*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]
diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686
index 890a86b..eb59441 100644
--- a/projects/instantbird/mozconfig-linux-i686
+++ b/projects/instantbird/mozconfig-linux-i686
@@ -28,7 +28,6 @@ ac_add_options --disable-debug
 ac_add_options --enable-default-toolkit=cairo-gtk2
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --with-tor-browser-version=
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64
index 7b22791..3148b44 100644
--- a/projects/instantbird/mozconfig-linux-x86_64
+++ b/projects/instantbird/mozconfig-linux-x86_64
@@ -23,7 +23,6 @@ ac_add_options --disable-debug
 ac_add_options --enable-default-toolkit=cairo-gtk2
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --with-tor-browser-version=
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64
index dafeeef..963191a 100644
--- a/projects/instantbird/mozconfig-osx-x86_64
+++ b/projects/instantbird/mozconfig-osx-x86_64
@@ -28,7 +28,6 @@ ac_add_options --disable-tests
 ac_add_options --disable-debug
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --with-tor-browser-version=
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686
index 0c3ff3c..7bc0696 100644
--- a/projects/instantbird/mozconfig-windows-i686
+++ b/projects/instantbird/mozconfig-windows-i686
@@ -28,7 +28,6 @@ ac_add_options --disable-signmar
 ac_add_options --disable-debug
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --with-tor-browser-version=
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar