commit 38766277cc49ff64e9e7af3fd4acedb192076664 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Jul 24 19:25:41 2017 -0400

Remove Python from tor-messenger/ Windows build

We are no longer building Python or pefile so remove it from the build. --- projects/tor-messenger/build | 10 ---------- projects/tor-messenger/config | 9 +-------- 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 422da29..ef93e17 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -112,16 +112,6 @@ MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff[% IF c("var/windows") %].exe[% END % [% IF c('var/windows') -%] makensis tor-messenger.nsi

-tar xf $rootdir/[% c('input_files_by_name/python-future') %] -cd $(echo [% c('input_files_by_name/python-future') %] | sed s/.tar.gz$//) -python setup.py install --user -cd .. - -tar xf $rootdir/[% c('input_files_by_name/python-pefile') %] -cd $(echo [% c('input_files_by_name/python-pefile') %] | sed s/.tar.gz$//) -python setup.py install --user -cd .. - mv tor-messenger-install.exe tor-messenger-install-tmp.exe python pe_checksum_fix.py mv tor-messenger-install-tmp2.exe tor-messenger-install.exe diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 6e9310d..bc730c8 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -26,14 +26,6 @@ input_files: enable: '[% c("var/osx") %]' - filename: tor-messenger.nsi enable: '[% c("var/windows") %]' - - name: python-future - URL: https://pypi.python.org/packages/00/2b/8d082ddfed935f3608cc61140df6dcbf0edea... - sha256sum: e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb - enable: '[% c("var/windows") %]' - - name: python-pefile - URL: https://pypi.python.org/packages/92/c0/8589ce9734ffdba258bd3e5acd4afb2e3586c... - sha256sum: f24021085b5c3ef7b0898bb1f1d93eecd3839e03512769e22b0c5a10d9095f7b - enable: '[% c("var/windows") %]' - filename: pe_checksum_fix.py enable: '[% c("var/windows") %]' - filename: fix-info-plist.py @@ -63,6 +55,7 @@ targets: - python - python-dev - build-essential + - python-pefile osx-x86_64: var: bundle_filename: 'TorMessenger-[% c("version") %]-osx64_en-US.dmg'