[tor-commits] [tor-browser-bundle/master] Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux

[mikeperry at torproject.org]

commit 53a8b3a994be27762c98bc3fa58f38a46532babc
Author: Kevin P. Dyer <kpdyer at gmail.com>
Date:   Sun Apr 6 17:53:46 2014 -0700

    Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux
---
 .../linux/gitian-pluggable-transports.yml          |    3 ++-
 .../windows/gitian-pluggable-transports.yml        |   23 ++++++++++----------
 gitian/versions                                    |    2 +-
 gitian/versions.alpha                              |    2 +-
 gitian/versions.beta                               |    2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index 6619a1c..fbea855 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -133,8 +133,9 @@ script: |
   cd ..
   #
   cd fteproxy
+  ln -s $INSTDIR/gmp thirdparty/gmp
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
-  CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" make
+  make
   cp -a bin/fteproxy $PTDIR/
   cp -ra fte $PTDIR/
   mkdir -p $INSTDIR/Docs/fteproxy
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 9b0e8ec..d2a3005 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -97,7 +97,6 @@ script: |
   make
   make install
   cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor
-  cp -an $INSTDIR/gmp/lib/*dll* $INSTDIR/Tor
   cd ..
   #
   #
@@ -119,6 +118,7 @@ script: |
   # http://wiki.winehq.org/msiexec
   # /qn disables user interface; /i installs.
   LD_PRELOAD= msiexec /qn /i python.msi TARGETDIR=$INSTDIR/python
+  sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $INSTDIR/python/Lib/distutils/cygwinccompiler.py
   INSTPYTHON="wine $INSTDIR/python/python.exe"
   #
   7z x py2exe.exe
@@ -226,21 +226,20 @@ script: |
   cd ..
   #
   cd fteproxy
-  cp $INSTDIR/gmp/bin/*dll* .
-  cp $INSTDIR/gmp/lib/*dll* .
   ln -s $INSTDIR/gmp thirdparty/gmp
+  cp -a $INSTDIR/gmp/bin/libgmp-*.dll .
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
-  make win32
-  make thirdparty/re2/obj/libre2.a
-  LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace
-  LD_PRELOAD= $INSTPYTHON setup.py py2exe
+  WINDOWS_BUILD=1 CROSS_COMPILE=1 make thirdparty/re2/obj/libre2.a
+  LD_PRELOAD= $INSTPYTHON setup_tbb.py build_ext -c mingw32
+  LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe
   py2exe_zip_timestomp dist/fteproxy.zip
-  mkdir -p $PTDIR/fte
-  mkdir -p $PTDIR/fte/tests
   cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/
-  cp -an fte/VERSION $PTDIR/fte
-  cp -ran fte/defs $PTDIR/fte
-  cp -ran fte/tests/dfas $PTDIR/fte/tests
+  mkdir -p $PTDIR/fte
+  cp -a fte/VERSION $PTDIR/fte
+  mkdir -p $PTDIR/fte/defs
+  cp -a fte/defs/*.json $PTDIR/fte/defs
+  mkdir -p $PTDIR/fte/tests/dfas
+  cp -a fte/tests/dfas/{*.dfa,*.regex} $PTDIR/fte/tests/dfas
   mkdir -p $INSTDIR/Docs/fteproxy
   cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy
   cd ..
diff --git a/gitian/versions b/gitian/versions
index b49c276..673cf32 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -17,7 +17,7 @@ MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
 OBFSPROXY_TAG=obfsproxy-0.2.4
 FLASHPROXY_TAG=1.6
-FTEPROXY_TAG=0.2.6
+FTEPROXY_TAG=0.2.12
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 
 GITIAN_TAG=tor-browser-builder-3.x-5
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 498bcb6..5447d76 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -18,7 +18,7 @@ MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
 OBFSPROXY_TAG=obfsproxy-0.2.6
 FLASHPROXY_TAG=1.6
-FTEPROXY_TAG=0.2.6
+FTEPROXY_TAG=0.2.12
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 
 GITIAN_TAG=tor-browser-builder-3.x-5
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 2d9c3af..8c8433d 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -18,7 +18,7 @@ MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
 OBFSPROXY_TAG=obfsproxy-0.2.6
 FLASHPROXY_TAG=1.6
-FTEPROXY_TAG=0.2.6
+FTEPROXY_TAG=0.2.12
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 
 GITIAN_TAG=tor-browser-builder-3.x-5