[tor-commits] [tor-browser-bundle/master] Use flashproxy 1.6 (master in nightly).

[gk at torproject.org]

commit 594fd98fad931aee764aa9cdd991e2ff60f37d73
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Feb 22 06:17:50 2014 +0000

    Use flashproxy 1.6 (master in nightly).
    
    Since 1.4, common code was moved into a Python module, which now has to
    be copied along with the programs. The dist-exe target also changed it
    default output directory.
---
 gitian/descriptors/linux/gitian-pluggable-transports.yml   |    2 +-
 gitian/descriptors/mac/gitian-pluggable-transports.yml     |    2 +-
 gitian/descriptors/windows/gitian-pluggable-transports.yml |    6 +++---
 gitian/versions                                            |    2 +-
 gitian/versions.alpha                                      |    2 +-
 gitian/versions.beta                                       |    2 +-
 gitian/versions.nightly                                    |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index 9aafc57..52f9af9 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -113,7 +113,7 @@ script: |
   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/
+  cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/
   mkdir -p $INSTDIR/Docs/FlashProxy
   cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy
   cd ..
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index d44193c..6f758d8 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -136,7 +136,7 @@ script: |
   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/
+  cp -a dist/flashproxy-client/{flashproxy,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 ..
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index a8535c6..a453f14 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -182,10 +182,10 @@ script: |
   cd flashproxy
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
   make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON"
-  py2exe_zip_timestomp dist/flashproxy-client/py2exe-flashproxy.zip
-  cp -an dist/flashproxy-client/{*.pyd,*.exe,*.zip} $PTDIR/
+  py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip
+  cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/
   mkdir -p $INSTDIR/Docs/FlashProxy
-  cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy
+  cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy
   cd ..
   #
   # http://bugs.winehq.org/show_bug.cgi?id=3591
diff --git a/gitian/versions b/gitian/versions
index 60d8b5a..21307e9 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.4
 OBFSPROXY_TAG=obfsproxy-0.2.3
-FLASHPROXY_TAG=1.4
+FLASHPROXY_TAG=1.6
 
 GITIAN_TAG=tor-browser-builder-3.0-4
 
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index cc673e0..0c34485 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.4
 OBFSPROXY_TAG=obfsproxy-0.2.3
-FLASHPROXY_TAG=1.4
+FLASHPROXY_TAG=1.6
 
 GITIAN_TAG=tor-browser-builder-3.0-4
 
diff --git a/gitian/versions.beta b/gitian/versions.beta
index b556ffe..3977261 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -15,7 +15,7 @@ LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.4
 OBFSPROXY_TAG=obfsproxy-0.2.3
-FLASHPROXY_TAG=1.4
+FLASHPROXY_TAG=1.6
 
 GITIAN_TAG=tor-browser-builder-3.0-4
 
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 6a604d2..e2ab7aa 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=master
 OBFSPROXY_TAG=master
-FLASHPROXY_TAG=1.4 # XXX: Archive and make targets changed in master...
+FLASHPROXY_TAG=master
 
 GITIAN_TAG=tor-browser-builder-3.0-4