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

[mikeperry at torproject.org]

commit d600b74dec96224bb82828dc8b2a562dd1f3ba00
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Nov 24 17:40:03 2013 +0000

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

diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index a447b16..5d419ad 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/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:
 - "setuptools.tar.gz"
 - "pycrypto.tar.gz"
@@ -156,6 +158,14 @@ script: |
   LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null
   cd ..
   #
+  cd flashproxy
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON"
+  cp -an dist/flashproxy-client/{*.pyd,*.exe,*.zip} $PTDIR/
+  mkdir -p $INSTDIR/Docs/FlashProxy
+  cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy
+  cd ..
+  #
   cd $INSTDIR
   ~/build/dzip.sh pluggable-transports-win32-gbuilt.zip Tor/ Data/
   cp pluggable-transports-win32-gbuilt.zip $OUTDIR/
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index 0aa8ff5..c2920d1 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -126,7 +126,7 @@ then
   echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******"
   echo 
 
-  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
+  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
   if [ $? -ne 0 ];
   then
     #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S`