[tor-commits] [flashproxy/master] Merge branch 'make_exe'

[dcf@xxxxxxxxxxxxxx]

commit 87a138818030b6230bb2fee8e5dc7064378bfee2
Merge: 7cc090c 9cd99ac
Author: David Fifield <david@xxxxxxxxxxxxxxx>
Date:   Sun Dec 2 16:56:17 2012 -0800

    Merge branch 'make_exe'
    
    Conflicts:
    	Makefile

 .gitignore                       |    1 +
 LICENSE                          |  219 +++++++++++
 Makefile                         |   27 ++-
 doc/LICENSE.GPL                  |  280 ++++++++++++++
 doc/LICENSE.PYTHON               |  773 ++++++++++++++++++++++++++++++++++++++
 doc/windows-deployment-howto.txt |  134 +++++++
 flashproxy-client.spec           |   26 ++
 7 files changed, 1457 insertions(+), 3 deletions(-)

diff --cc Makefile
index 46f621c,6723dab..fbc8a2e
--- a/Makefile
+++ b/Makefile
@@@ -4,6 -2,12 +4,10 @@@ PREFIX = /usr/loca
  BINDIR = $(PREFIX)/bin
  MANDIR = $(PREFIX)/share/man
  
+ PYTHON = python
+ PYINSTALLER_PY = ../pyinstaller-2.0/pyinstaller.py
+ export PYINSTALLER_TMPDIR = pyinstaller-tmp
+ 
 -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
@@@ -39,13 -54,20 +44,29 @@@ sign: dist/$(DISTNAME).zi
  	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.
+ dist-exe: DISTNAME := $(DISTNAME)-win32
+ dist-exe: CLIENT_BIN := $(PYINSTALLER_TMPDIR)/dist/*
+ dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN))
+ # Delegate to the "dist" target using the substitutions above.
+ dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec dist
+ 
 -.PHONY: all install clean test dist sign dist-exe
 +clean:
 +	rm -f *.pyc
- 	rm -rf dist
++	rm -rf dist $(PYINSTALLER_TMPDIR)
 +
 +test:
 +	./flashproxy-client-test
 +	cd facilitator && ./facilitator-test
 +	cd proxy && ./flashproxy-test.js
 +
- .PHONY: all install dist sign clean test
++.PHONY: all install dist sign dist-exe clean test

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits