[tor-commits] [tor-messenger-build/master] Initialize Tor Messenger branding

[sukhbir at torproject.org]

commit b76fa5f9ca482edd8dbee2a07e388279b08fa416
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Apr 15 04:18:06 2015 -0400

    Initialize Tor Messenger branding
---
 projects/instantbird/build                  |    2 ++
 projects/instantbird/mozconfig-linux-i686   |    2 ++
 projects/instantbird/mozconfig-linux-x86_64 |    2 ++
 projects/instantbird/mozconfig-windows-i686 |    1 +
 4 files changed, 7 insertions(+)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index 91b0320..d2dcee1 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -38,6 +38,8 @@ do
 done
 cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
 cp ../cert_override.txt im/app/profile
+mkdir im/branding/messenger
+cp -R im/branding/nightly/* im/branding/messenger/
 cd mozilla
 if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1
 then
diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686
index 52fd2e9..7bb9b61 100644
--- a/projects/instantbird/mozconfig-linux-i686
+++ b/projects/instantbird/mozconfig-linux-i686
@@ -20,3 +20,5 @@ ac_add_options --disable-debug
 
 ac_add_options --with-l10n-base=..
 ac_add_options --host=i686-linux-gnu
+
+ac_add_options --with-branding=im/branding/messenger
diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64
index d3cf703..919b52e 100644
--- a/projects/instantbird/mozconfig-linux-x86_64
+++ b/projects/instantbird/mozconfig-linux-x86_64
@@ -16,3 +16,5 @@ ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
 ac_add_options --with-l10n-base=..
+
+ac_add_options --with-branding=im/branding/messenger
diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686
index 4c67a40..f3c76c4 100644
--- a/projects/instantbird/mozconfig-windows-i686
+++ b/projects/instantbird/mozconfig-windows-i686
@@ -27,3 +27,4 @@ ac_add_options --disable-webrtc
 ac_add_options --disable-tests
 ac_add_options --disable-signmar
 
+ac_add_options --with-branding=im/branding/messenger