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

[mikeperry at torproject.org]

commit e85b8ace5509920d1a24b3240b9da0407463d8b6
Author: David Fifield <david at bamsoftware.com>
Date:   Tue Nov 12 06:41:11 2013 +0000

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

diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index c05d563..1824fcd 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -21,6 +21,8 @@ remotes:
   "dir": "pyptlib"
 - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git"
   "dir": "obfsproxy"
+- "url": "https://git.torproject.org/flashproxy.git"
+  "dir": "flashproxy"
 files:
 - "pycrypto.tar.gz"
 - "argparse.tar.gz"
@@ -131,6 +133,14 @@ script: |
   cp -a build/M2Crypto $PTDIR/
   cd ..
   #
+  cd flashproxy
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  make dist DISTNAME=flashproxy-client
+  cp -a dist/flashproxy-client/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/
+  mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy
+  cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy
+  cd ..
+  #
   cd $INSTDIR
   ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app
   cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 5a7e1d2..191b1e1 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,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
+  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_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`