[tor-commits] [tor-messenger-build/master] Use cached python-pefile

[arlo at torproject.org]

commit 1a10d414698d7fb0483dd80baaacf91bf148f4ce
Author: Arlo Breault <arlolra at gmail.com>
Date:   Wed Nov 2 17:30:23 2016 -0700

    Use cached python-pefile
    
     * Suggested in,
       https://github.com/TheTorProject/tor-messenger-build/pull/10#issuecomment-258009520
---
 projects/tor-messenger/build                   |  12 +++++++++++-
 projects/tor-messenger/config                  |   5 ++++-
 projects/tor-messenger/future-0.16.0.tar.gz    | Bin 0 -> 824484 bytes
 projects/tor-messenger/pefile-2016.3.28.tar.gz | Bin 0 -> 58110 bytes
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index ad6b112..fb3a27d 100755
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -91,8 +91,18 @@ cd ..
 mv bundle tor-messenger
 [% IF c('var/windows') -%]
 makensis tor-messenger.nsi
+
+tar xf future-0.16.0.tar.gz
+cd future-0.16.0/
+python setup.py install --user
+cd ..
+
+tar xf pefile-2016.3.28.tar.gz
+cd pefile-2016.3.28/
+python setup.py install --user
+cd ..
+
 mv tor-messenger-install.exe tor-messenger-install-tmp.exe
-pip install --user pefile==2016.3.28
 python pe_checksum_fix.py
 mv tor-messenger-install-tmp2.exe tor-messenger-install.exe
 rm tor-messenger-install-tmp.exe
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index 395a77b..f1e4b88 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -26,6 +26,10 @@ input_files:
     enable: '[% c("var/osx") %]'
   - filename: tor-messenger.nsi
     enable: '[% c("var/windows") %]'
+  - filename: future-0.16.0.tar.gz
+    enable: '[% c("var/windows") %]'
+  - filename: pefile-2016.3.28.tar.gz
+    enable: '[% c("var/windows") %]'
   - filename: pe_checksum_fix.py
     enable: '[% c("var/windows") %]'
   - filename: cert_override.txt
@@ -51,7 +55,6 @@ targets:
       arch_deps:
         - nsis
         - python
-        - python-pip
         - python-dev
         - build-essential
   osx-x86_64:
diff --git a/projects/tor-messenger/future-0.16.0.tar.gz b/projects/tor-messenger/future-0.16.0.tar.gz
new file mode 100644
index 0000000..271b7e0
Binary files /dev/null and b/projects/tor-messenger/future-0.16.0.tar.gz differ
diff --git a/projects/tor-messenger/pefile-2016.3.28.tar.gz b/projects/tor-messenger/pefile-2016.3.28.tar.gz
new file mode 100644
index 0000000..c045e69
Binary files /dev/null and b/projects/tor-messenger/pefile-2016.3.28.tar.gz differ