[tbb-commits] [tor-browser-bundle/master] Install argparse in windows pluggable-transports.

[mikeperry at torproject.org]

commit e68a2db0e6753f3d1d6839c17b88ba987c1c8f14
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Mar 2 04:25:52 2014 +0000

    Install argparse in windows pluggable-transports.
    
    coderman on IRC noticed that the building of obfsproxy in the windows
    pluggable transports descriptor was downloading argparse:
    
    	Processing dependencies for obfsproxy==unknown
    	Searching for argparse
    	Reading https://pypi.python.org/simple/argparse/
    	Application tried to create a window, but no driver could be loaded.
    	Make sure that your X server is running and that $DISPLAY is set correctly.
    	err:systray:initialize_systray Could not create tray window
    	fixme:toolhelp:CreateToolhelp32Snapshot Unimplemented: heap list snapshot
    	fixme:toolhelp:Heap32ListFirst : stub
    	Best match: argparse 1.2.1
    	Downloading http://argparse.googlecode.com/files/argparse-1.2.1.tar.gz#md5=2fbef8cb61e506c706957ab6e135840c
    	Processing argparse-1.2.1.tar.gz
    
    argparse was already being installed in the linux and mac descriptors.
    It was not needed in the windows descriptor, because the windows build
    uses Python 2.7, and Python 2.7 has argparse in the standard library;
    and the "py2exe" target was able to find the standard module. However
    commit 8f8a4cd59bfe07e5b8c12e3990627544d9caeab4 changed obfsproxy to
    additionally call the "install" target (so that fteproxy could use
    obfsproxy), and apparently "install" can't find argparse. (Maybe because
    it's a .py file instead of a directory or an egg?)
---
 gitian/descriptors/windows/gitian-pluggable-transports.yml |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 48efba5..9b0e8ec 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -31,6 +31,7 @@ files:
 - "gmp.tar.bz2"
 - "setuptools.tar.gz"
 - "pycrypto.tar.gz"
+- "argparse.tar.gz"
 - "zope.interface.zip"
 - "twisted.tar.bz2"
 - "m2crypto.tar.gz"
@@ -156,6 +157,12 @@ script: |
   LD_PRELOAD= $INSTPYTHON setup.py install
   cd ..
   #
+  tar xzf argparse.tar.gz
+  cd argparse-*
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  LD_PRELOAD= $INSTPYTHON setup.py install
+  cd ..
+  #
   unzip zope.interface.zip
   cd zope.interface-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"