December 2012 - tor-commits - lists.torproject.org

[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

[flashproxy/master] Make dist-exe depend on the spec file.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit df32055948e52d5c2af38862c37663a6eabb5f86 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:27:53 2012 -0800 Make dist-exe depend on the spec file. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index fd83864..96b8a8d 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ sign: dist/$(DISTNAME).zip DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 -dist-exe: $(CLIENT_BIN) +dist-exe: $(CLIENT_BIN) flashproxy-client.spec rm -rf $(DISTDIR_WIN32) mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc

1 0

[flashproxy/master] Use --log-level=WARN in PyInstaller.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit c6f8fd940dc7a49798c2458b54eb1557f97e809a Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:07:25 2012 -0800 Use --log-level=WARN in PyInstaller. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 872029f..009aeb9 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ dist-exe: $(CLIENT_BIN) flashproxy-client.spec # PyInstaller writes "ERROR" to stderr (along with its other messages) when it # fails to find a hidden import like M2Crypto, but continues anyway and doesn't # change its error code. Grep for "ERROR" and stop if found. - $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build flashproxy-client.spec 2>&1 | tee /dev/tty | grep -q "ERROR"; test $$? == 1 + $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build --log-level=WARN flashproxy-client.spec 2>&1 | tee /dev/tty | grep -q "ERROR"; test $$? == 1 cp -f $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR_WIN32) cp -f README LICENSE torrc $(DISTDIR_WIN32) cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR_WIN32)/doc

1 0

[flashproxy/master] Use a tee trick to show PyInstaller output while grepping it.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 92af1091bfb45b6b571276336fd0568cd7f25ab8 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 09:59:11 2012 -0800 Use a tee trick to show PyInstaller output while grepping it. --- Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d747864..872029f 100644 --- a/Makefile +++ b/Makefile @@ -62,8 +62,10 @@ dist-exe: $(CLIENT_BIN) flashproxy-client.spec rm -rf dist $(PYINSTALLER_TMPDIR) mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc - $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build flashproxy-client.spec 2>&1 \ - | grep "ERROR"; [ $$? == 1 ] +# PyInstaller writes "ERROR" to stderr (along with its other messages) when it +# fails to find a hidden import like M2Crypto, but continues anyway and doesn't +# change its error code. Grep for "ERROR" and stop if found. + $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build flashproxy-client.spec 2>&1 | tee /dev/tty | grep -q "ERROR"; test $$? == 1 cp -f $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR_WIN32) cp -f README LICENSE torrc $(DISTDIR_WIN32) cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR_WIN32)/doc

1 0

[flashproxy/master] Whitespace and style.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 12d9058334f61b395d323e98de6e281d888748f0 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:18:38 2012 -0800 Whitespace and style. --- Makefile | 1 + flashproxy-client.spec | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6db2c2a..e68ae46 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,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 diff --git a/flashproxy-client.spec b/flashproxy-client.spec index 9914932..dbcde2f 100644 --- a/flashproxy-client.spec +++ b/flashproxy-client.spec @@ -1,7 +1,5 @@ -# -# PyInstaller spec file for the flashproxy client programs. +# PyInstaller spec file for the flash proxy 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']

1 0