commit 1d09aeda2aa58a80cb14ce155c849ec9b64ec1d2 Author: David Fifield david@bamsoftware.com Date: Mon Nov 11 08:00:32 2013 +0000
Build flashproxy for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 10 ++++++++++ gitian/mkbundle-linux.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 85c5bc9..7d6a8b9 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -22,6 +22,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" @@ -108,6 +110,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/Docs/FlashProxy + cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy + cd .. + # cd $INSTDIR # ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 64b3fa4..9ef0910 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -128,7 +128,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo
- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S`