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

[mikeperry at torproject.org]

commit 915527395348939c43d1776604d6f5d9bfafa9db
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Nov 18 05:31:35 2013 +0000

    Build obfsproxy 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 750d69a..e0f7330 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/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:
 - "setuptools.tar.gz"
 - "pycrypto.tar.gz"
@@ -130,6 +132,14 @@ script: |
   LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null
   cd ..
   #
+  cd obfsproxy
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe
+  cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/
+  mkdir -p $INSTDIR/Docs/Obfsproxy
+  cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy
+  cd ..
+  #
   cd openssl
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
   ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index c08b86f..0aa8ff5 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 $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
+  ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_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`