- tor-commits - lists.torproject.org

[flashproxy/master] Define a CLIENT_DIST_DOC_FILES separate from CLIENT_MAN.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit b730c8fed6f494bd64d53bb871aae5f9ca4c06d3 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 24 02:32:10 2012 -0800 Define a CLIENT_DIST_DOC_FILES separate from CLIENT_MAN. --- Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 7e56448..5203922 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ VERSION = 0.8 CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc +CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) all: $(CLIENT_DIST_FILES) $(CLIENT_MAN) : @@ -41,7 +42,7 @@ dist: $(CLIENT_MAN) mkdir -p $(DISTDIR) mkdir $(DISTDIR)/doc cp -f $(CLIENT_DIST_FILES) $(DISTDIR) - cp -f $(CLIENT_MAN) $(DISTDIR)/doc + cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR)/doc cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) dist/$(DISTNAME).zip: $(CLIENT_DIST_FILES)

1 0

[flashproxy/master] Add instructions to build OpenSSL from source.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 76a1e52e1f2813d84e6f77706b6efd26ef9542e3 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 24 03:43:30 2012 -0800 Add instructions to build OpenSSL from source. The link to unofficial Windows binaries at openssl.org looks really dodgy. Building from source turns out not to be hard if you already have Cygwin. --- doc/windows-deployment-howto.txt | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index 5c0e22c..1cdca2b 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -56,12 +56,21 @@ The 2.0 release can be found at http://www.pyinstaller.org. The program is a Python script, there is no installation required, just extract the archive somehwere. -3. OpenSSL +3. OpenSSL http://www.openssl.org/source/ -There are no official binary distributions of OpenSSL. -The source is available at http://www.openssl.org/source/. -This page provides links to unofficial binary distributions, -http://www.openssl.org/related/binaries.html. +http://openssl.org/source/openssl-1.0.1c.tar.gz +http://openssl.org/source/openssl-1.0.1c.tar.gz.asc +$ gpg --verify openssl-1.0.1c.tar.gz.asc + +Build OpenSSL from source using Cygwin and MinGW. Install the package +mingw-gcc-core. Run these commands in the OpenSSL source directory: + +CROSS_COMPILE=i686-pc-mingw32- ./Configure shared mingw +make +make install + +Then, add C:\cygwin\usr\local\ssl\bin to PATH as you did for Python +above. 4. M2Crypto

1 0

[flashproxy/master] Add URL of the M2Crypto installer I tried.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit f5425141b1e82896736e5c00f3d0b835d4a403a2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 24 06:07:31 2012 -0800 Add URL of the M2Crypto installer I tried. --- doc/windows-deployment-howto.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index 1cdca2b..e348338 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -78,6 +78,8 @@ There are no official binary distributions of M2Crypto. The official source along, with several unofficial binaries, is available at http://chandlerproject.org/Projects/MeTooCrypto. +http://chandlerproject.org/pub/Projects/MeTooCrypto/M2Crypto-0.21.1.win32-py2.7.msi + == Bundling Once the dependencies are installed, you should be able

1 0

[flashproxy/master] Commiting merge of make_exe branch from https://git.torproject.org/user/dcf/flashproxy.git
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 34165e549824e5e6ebbea8b687d86615c3bf4c32 Merge: 45a9555 f542514 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sat Nov 24 19:49:47 2012 -0500 Commiting merge of make_exe branch from https://git.torproject.org/user/dcf/flashproxy.git LICENSE | 219 +++++++++++ Makefile | 8 +- doc/LICENSE.GPL | 280 ++++++++++++++ doc/LICENSE.PYTHON | 773 ++++++++++++++++++++++++++++++++++++++ doc/windows-deployment-howto.txt | 48 ++- flashproxy-client | 5 +- 6 files changed, 1321 insertions(+), 12 deletions(-)

1 0

[flashproxy/master] Updating .PHONY make target to include dist-exe.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 6765aa33420974ed40af5f278d5787ca03ab4357 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Mon Nov 26 10:03:54 2012 -0800 Updating .PHONY make target to include dist-exe. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 3dfb8e1..6db2c2a 100644 --- a/Makefile +++ b/Makefile @@ -66,4 +66,4 @@ dist-exe: $(CLIENT_BIN) cd dist && zip -q -r -9 $(DISTNAME)-win32.zip $(DISTNAME)-win32 rm -rf logdict* $(PYINSTALLER_TMPDIR) -.PHONY: all install clean test dist sign exe +.PHONY: all install clean test dist sign dist-exe

1 0

[flashproxy/master] Adding PyInstaller spec file for client programs.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 3e135228750d6ce50646c5d5a716db92d41fe8e7 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Mon Nov 26 09:53:52 2012 -0800 Adding PyInstaller spec file for client programs. This commit implements changes requested in the second comment for trac ticket 7283. - Spec file added for client programs, they are now bundled with one invocation of PyInstaller. - Make target for windows deployment is now called dist-exe, produces dist/flashproxy-client-VERSION-win32.zip. Cleans up PyInstaller log and build files after. Produces an error if PyInstaller cannot bundle M2Crypto. --- Makefile | 25 +++++++++++++------------ flashproxy-client.spec | 28 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index fdf5832..3dfb8e1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ MANDIR = $(PREFIX)/share/man PYTHON = python PYINSTALLER_PY = ../pyinstaller-2.0/pyinstaller.py - +export PYINSTALLER_TMPDIR = pyi VERSION = 0.8 CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http @@ -53,16 +53,17 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip -exe: $(CLIENT_BIN) - rm -rf $(DISTDIR) - mkdir -p $(DISTDIR) - for file in $(CLIENT_BIN); \ - do \ - $(PYTHON) $(PYINSTALLER_PY) --onedir $$file; \ - cp dist/$$file/* $(DISTDIR); \ - mv $(DISTDIR)/$$file.exe $(DISTDIR)/$$file; \ - rm -rf dist/$$file; \ - done - mv $(DISTDIR)/M2Crypto.__m2crypto.pyd $(DISTDIR)/__m2crypto.pyd +dist-exe: $(CLIENT_BIN) + rm -rf $(DISTDIR)-win32 + mkdir -p $(DISTDIR)-win32 + mkdir $(DISTDIR)-win32/doc + $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build flashproxy-client.spec 2>&1 \ + | grep "ERROR"; [ $$? == 1 ] + cp -f $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR)-win32 + cp -f README LICENSE torrc $(DISTDIR)-win32 + cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR)-win32/doc + mv $(DISTDIR)-win32/M2Crypto.__m2crypto.pyd $(DISTDIR)-win32/__m2crypto.pyd + cd dist && zip -q -r -9 $(DISTNAME)-win32.zip $(DISTNAME)-win32 + rm -rf logdict* $(PYINSTALLER_TMPDIR) .PHONY: all install clean test dist sign exe diff --git a/flashproxy-client.spec b/flashproxy-client.spec new file mode 100644 index 0000000..9914932 --- /dev/null +++ b/flashproxy-client.spec @@ -0,0 +1,28 @@ +# +# PyInstaller spec file for the flashproxy client programs. +# Modelled after example at http://www.pyinstaller.org/export/v2.0/project/doc/Manual.html?format=raw#m…. +# + +# Top-level directory. +tmpdir = os.environ['PYINSTALLER_TMPDIR'] +scripts = ('flashproxy-client', 'flashproxy-reg-email', 'flashproxy-reg-http') + +# M2Crypto is listed as hidden import so PyInstaller fails if it cannot find it. +analyses = [(Analysis([script], hiddenimports=['M2Crypto']), + script, + os.path.join(tmpdir, 'build', script + '.exe')) for script in scripts] + +MERGE(*analyses) + +tocs = [] +for a, _, exename in analyses: + pyz = PYZ(a.pure) + tocs.append(EXE(pyz, + a.scripts, + exclude_binaries=1, + console=True, + name=exename)) + tocs.append(a.binaries) + + +COLLECT(*tocs, name=os.path.join(tmpdir, 'dist'))

1 0

[flashproxy/master] Merge branch 'master' of https://git.torproject.org/flashproxy into make_exe
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit e00477ac57ef6403a1a7ec06166f957031cb4783 Merge: 6765aa3 878dc70 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Nov 29 15:48:29 2012 +0000 Merge branch 'master' of https://git.torproject.org/flashproxy into make_exe ChangeLog | 5 +++++ proxy/flashproxy.js | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-)

1 0

[flashproxy/master] Use DISTDIR_WIN32 and DISTNAME_WIN32 defines.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 93c3209585b4adc75705221ad0e71ca6013b3173 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:27:17 2012 -0800 Use DISTDIR_WIN32 and DISTNAME_WIN32 defines. --- Makefile | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index e68ae46..fd83864 100644 --- a/Makefile +++ b/Makefile @@ -54,17 +54,19 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip +DISTNAME_WIN32 = $(DISTNAME)-win32 +DISTDIR_WIN32 = $(DISTDIR)-win32 dist-exe: $(CLIENT_BIN) - rm -rf $(DISTDIR)-win32 - mkdir -p $(DISTDIR)-win32 - mkdir $(DISTDIR)-win32/doc + rm -rf $(DISTDIR_WIN32) + mkdir -p $(DISTDIR_WIN32) + mkdir $(DISTDIR_WIN32)/doc $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build flashproxy-client.spec 2>&1 \ | grep "ERROR"; [ $$? == 1 ] - cp -f $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR)-win32 - cp -f README LICENSE torrc $(DISTDIR)-win32 - cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR)-win32/doc - mv $(DISTDIR)-win32/M2Crypto.__m2crypto.pyd $(DISTDIR)-win32/__m2crypto.pyd - cd dist && zip -q -r -9 $(DISTNAME)-win32.zip $(DISTNAME)-win32 + cp -f $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR_WIN32) + cp -f README LICENSE torrc $(DISTDIR_WIN32) + cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR_WIN32)/doc + mv $(DISTDIR_WIN32)/M2Crypto.__m2crypto.pyd $(DISTDIR_WIN32)/__m2crypto.pyd + cd dist && zip -q -r -9 $(DISTNAME_WIN32).zip $(DISTNAME_WIN32) rm -rf logdict* $(PYINSTALLER_TMPDIR) .PHONY: all install clean test dist sign dist-exe

1 0

[flashproxy/master] Comment dist-exe with a pointer to deployment howto.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 42d9db13f52b16d17e35bc31cb9fe50e85cb94a1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:28:40 2012 -0800 Comment dist-exe with a pointer to deployment howto. --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 96b8a8d..c6996b2 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip +# See doc/windows-deployment-howto.txt. DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 dist-exe: $(CLIENT_BIN) flashproxy-client.spec

1 0

[flashproxy/master] Remove $(PYINSTALLER_TMPDIR) on "make clean".
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit de34818140a9777657d663d712f7a5e655738a5e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:29:59 2012 -0800 Remove $(PYINSTALLER_TMPDIR) on "make clean". --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index c6996b2..53a89b8 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ install: clean: rm -f *.pyc - rm -rf dist + rm -rf dist $(PYINSTALLER_TMPDIR) test: ./flashproxy-client-test

1 0