[tor-commits] [tor-browser-bundle/master] Build obfsproxy for mac.

[mikeperry at torproject.org]

commit 3b8a3ce0131b803e5b09647e69387a4b5856ac88
Author: David Fifield <david at bamsoftware.com>
Date:   Tue Nov 12 06:37:15 2013 +0000

    Build obfsproxy for mac.
---
 gitian/descriptors/mac/gitian-pluggable-transports.yml |   11 +++++++++++
 gitian/mkbundle-mac.sh                                 |    2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index e9bd238..2ba29c8 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -18,6 +18,8 @@ remotes:
   "dir": "openssl"
 - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git"
   "dir": "pyptlib"
+- "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git"
+  "dir": "obfsproxy"
 files:
 - "pycrypto.tar.gz"
 - "argparse.tar.gz"
@@ -96,6 +98,15 @@ script: |
   cp -a build/twisted $PTDIR/
   cd ..
   #
+  cd obfsproxy
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  python setup.py build --build-lib build
+  cp -a build/obfsproxy $PTDIR/
+  cp -a bin/obfsproxy $PTDIR/obfsproxy.bin
+  mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy
+  cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy
+  cd ..
+  #
   cd openssl
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
   CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index debc170..5a7e1d2 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -124,7 +124,7 @@ then
   echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******"
   echo 
 
-  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
+  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
   if [ $? -ne 0 ];
   then
     #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S`