March 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Change bundling instructions to work with py2exe.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 5cb814d6aeaa540756583bf317c3c126d217cf39 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Mar 14 17:53:06 2013 -0700 Change bundling instructions to work with py2exe. py2exe requires extra work to help it find modules, like unzipping eggs and creating dummy __init__.py files. --- doc/bundle-windows.txt | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt … [View More]index a9885d1..db065aa 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -48,6 +48,10 @@ The sha256sum of the package I used was $ /cygdrive/c/Python27/Scripts/easy_install zope.interface-4.0.3-py2.7-win32.egg +After installing, add an empty file named "__init__.py" to the root folder of the zope +installation directory. On most systems this is C:\Python27\Lib\site-packages\zope. This +helps py2exe bundle the zope module. + === Twisted http://twistedmatrix.com/trac/wiki/Downloads @@ -64,6 +68,8 @@ http://twistedmatrix.com/Releases/twisted-12.3.0-md5sums.txt $ cd pyptlib $ /cygdrive/c/Python27/python.exe setup.py install +After installing make sure the pyptlib .egg file in your site-packages folder is unzipped. + == Browser bundle Clone and build the flashproxy source. @@ -72,12 +78,12 @@ Clone and build the flashproxy source. $ cd flashproxy $ make dist-exe PYTHON=/cygdrive/c/Python27/python -Clone pyobfsproxy and run PyInstaller on it. +Clone pyobfsproxy and run py2exe on it. $ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git $ cd pyobfsproxy $ git checkout pyobfsproxy-0.0.2 - $ /cygdrive/c/Python27/python.exe ../pyinstaller-2.0/pyinstaller.py bin/pyobfsproxy + $ /cygdrive/c/Python27/python.exe setup_py2exe.py py2exe Download the browser bundle from https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb…. @@ -95,10 +101,10 @@ Copy files into the bundle. The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll from being overwritten. $ cd "Tor Browser" - $ cp -nr ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App + $ cp -nr ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.zip} App $ mkdir -p Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy - $ cp -nr ~/pyobfsproxy/dist/pyobfsproxy/{*.pyd,*.dll,*.exe,*.manifest,eggs} App + $ cp -nr ~/pyobfsproxy/py2exe_bundle/dist/{*.pyd,*.dll,*.exe,*.zip} App $ mkdir -p Docs/PyObfsproxy $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy [View Less]

1 0

[flashproxy/master] Ignore py2exe ouptut directory.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 6dbf32283bf599b1931a0f6244c5fe64a1eff962 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Mar 14 22:25:12 2013 -0400 Ignore py2exe ouptut directory. --- .gitignore | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 41e7192..b8833f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *.pyc /dist -/pyinstaller-tmp +/py2exe-tmp /websocket-transport/websocket-server

1 0

[flashproxy/master] Use py2exe in dist-exe target.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 611027c4f5b4cc4037e0e1ec10d8eccc69934f34 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Mon Mar 11 19:20:18 2013 -0700 Use py2exe in dist-exe target. Make the dist-exe make target use p2exe rather than pyinstaller. This removes some error handling and cleanup. --- Makefile | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index ccf9718..3d843f1 100644 --- a/Makefile +++ b/… [View More]

1 0

[flashproxy/master] Whitespace in setup.py.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit cdad4a8fe016e08d482364e91e994dda6366d447 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 14 22:03:30 2013 -0700 Whitespace in setup.py. --- setup.py | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 164a671..c765e2b 100644 --- a/setup.py +++ b/setup.py @@ -1,18 +1,18 @@ -from distutils.core import setup -import os -import py2exe - -build_path = os.path.join(os.environ["… [View More]

1 0

[flashproxy/master] Manual creation of __init__.py seems not necessary.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit fbdc4c33800a1dd9fd3693a601354575e63bd68a Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 14 22:39:28 2013 -0700 Manual creation of __init__.py seems not necessary. After installing with easy_install. --- doc/bundle-windows.txt | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index dba4ac4..e796f8b 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -48,10 +48,6 @… [View More]

1 0

[flashproxy/master] Add obfs2 bridge to bundle instructions.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 450f7f0cd653c1316f4e09ae41e3985dd64a6e86 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Mar 14 22:36:11 2013 -0400 Add obfs2 bridge to bundle instructions. --- doc/bundle-windows.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index db065aa..dba4ac4 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -124,6 +124,7 @@ Bridge obfs2 169.229.59.75:47809 Bridge … [View More]

1 0

[flashproxy/master] Name the py2exe zipfile so it's clear it's a py2exe thing.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 90c660140dd1b8114a2a2bff1e8ba637b49fff3a Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 14 22:55:58 2013 -0700 Name the py2exe zipfile so it's clear it's a py2exe thing. Hopefully it will make the purpose of the file less mysterious in an extracted directory than "flashproxy.zip". Probably we can find a way to share library files that are used both in flash proxy and pyobfsproxy. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 … [View More]

1 0

[flashproxy/master] Instructions for py2exe.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 171f6f8bf1debafa8d09ccd749d91e891f89abe3 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 14 22:40:03 2013 -0700 Instructions for py2exe. I think that pywin32 is not needed as it is for PyInstaller. --- doc/windows-deployment-howto.txt | 23 ++++------------------- 1 files changed, 4 insertions(+), 19 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index a554c7d..5c3c393 100644 --- a/doc/windows-… [View More]

1 0

[flashproxy/master] Use a different install of pyptlib to avoid unzipping.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 7b54005fa4d3a1615026e5de857839a33f409445 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 14 22:40:51 2013 -0700 Use a different install of pyptlib to avoid unzipping. --- doc/bundle-windows.txt | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index e796f8b..d1ede55 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -62,9 +62,7 @@ http://twistedmatrix.com/Releases/… [View More]

1 0

[flashproxy/master] We're using pyobfsproxy master, not 0.0.2, for py2exe support.
by dcf＠torproject.org 15 Mar '13

15 Mar '13

commit 011ea655a3aad22737d6d41ef55dfd7e1ddd106d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 14 23:12:30 2013 -0700 We're using pyobfsproxy master, not 0.0.2, for py2exe support. --- doc/bundle-windows.txt | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index d1ede55..f355774 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -76,7 +76,6 @@ Clone pyobfsproxy and run py2exe on … [View More]

1 0