- tor-commits - lists.torproject.org

[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

[flashproxy/master] Remove the whole dist directory in "make dist-exe".
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit b604485449ff7721babe544c5eef88d0aeea8aba Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:30:21 2012 -0800 Remove the whole dist directory in "make dist-exe". --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 53a89b8..9168b9e 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ sign: dist/$(DISTNAME).zip DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 dist-exe: $(CLIENT_BIN) flashproxy-client.spec - rm -rf $(DISTDIR_WIN32) + rm -rf dist mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build flashproxy-client.spec 2>&1 \

1 0

[flashproxy/master] rm $(PYINSTALLER_TMPDIR) before dist-exe.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 78025e6fdfaa0edd6bbd24233f3aae580b3484c9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 09:54:49 2012 -0800 rm $(PYINSTALLER_TMPDIR) before dist-exe. Error: The output directory "C:\...\flashproxy\pyi\dist" is not empty. Please remove all its contents or use the -y option (remove output directory without confirmation). Makefile:62: recipe for target `dist-exe' failed --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index f154eaa..d747864 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) dist-exe: $(CLIENT_BIN) flashproxy-client.spec - rm -rf dist + 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 \

1 0

[flashproxy/master] Install txt man pages in win32 dist.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 6549112eba8cb7de09e2b8e642d3569469145a5b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:33:46 2012 -0800 Install txt man pages in win32 dist. --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 9168b9e..f154eaa 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,7 @@ sign: dist/$(DISTNAME).zip # See doc/windows-deployment-howto.txt. DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 +dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) dist-exe: $(CLIENT_BIN) flashproxy-client.spec rm -rf dist mkdir -p $(DISTDIR_WIN32)

1 0

[flashproxy/master] Override CLIENT_BIN for dist-exe.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 7ca852a0789c4851e1f0a538b19aebfd04923556 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:35:46 2012 -0800 Override CLIENT_BIN for dist-exe. This removes special cases, so the body of dist-exe is now the same as that of dist, except for DISTNAME and DISTDIR versus DISTNAME_WIN32 and DISTDIR_WIN32. --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9a02e3b..4922b33 100644 --- a/Makefile +++ b/Makefile @@ -66,13 +66,13 @@ $(PYINSTALLER_TMPDIR)/dist: $(CLIENT_BIN) # See doc/windows-deployment-howto.txt. DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 +dist-exe: CLIENT_BIN := $(PYINSTALLER_TMPDIR)/dist/* dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec rm -rf dist mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc - cp -f $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR_WIN32) - cp -f README LICENSE torrc $(DISTDIR_WIN32) + cp -f $(CLIENT_DIST_FILES) $(DISTDIR_WIN32) cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR_WIN32)/doc cd dist && zip -q -r -9 $(DISTNAME_WIN32).zip $(DISTNAME_WIN32)

1 0

[flashproxy/master] Break out a sub-target for PyInstaller.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit e6b5abe132cef7ce77daddb0c15f20f3efc58504 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:30:26 2012 -0800 Break out a sub-target for PyInstaller. --- Makefile | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 009aeb9..9a02e3b 100644 --- a/Makefile +++ b/Makefile @@ -54,23 +54,26 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip +$(PYINSTALLER_TMPDIR)/dist: $(CLIENT_BIN) + rm -rf $(PYINSTALLER_TMPDIR) +# 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 --log-level=WARN flashproxy-client.spec 2>&1 | tee /dev/tty | grep -q "ERROR"; test $$? == 1 + mv $(PYINSTALLER_TMPDIR)/dist/M2Crypto.__m2crypto.pyd $(PYINSTALLER_TMPDIR)/dist/__m2crypto.pyd + rm -rf logdict*.log + # See doc/windows-deployment-howto.txt. DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) -dist-exe: $(CLIENT_BIN) flashproxy-client.spec - rm -rf dist $(PYINSTALLER_TMPDIR) +dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec + rm -rf dist mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc -# 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 --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 - 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] Longer name for PYINSTALLER_TMPDIR.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 51f5806854b5a2b3578b65cdf5da60abdb2ad785 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:58:46 2012 -0800 Longer name for PYINSTALLER_TMPDIR. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 2eb14ae..6723dab 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 +export PYINSTALLER_TMPDIR = pyinstaller-tmp VERSION = 0.8

1 0