From 9e94fdc6db83bc2d11b6a9cd1df5222827df3ce8 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 15 May 2013 11:25:25 +1200
Subject: [PATCH] Make ready for pyinstaller.

---
 mitmdump                           |  3 ++-
 mitmproxy                          |  2 +-
 {scripts => release}/contributors  |  0
 release/pyinstaller-mitmdump.spec  | 20 ++++++++++++++++++++
 release/pyinstaller-mitmproxy.spec | 16 ++++++++++++++++
 5 files changed, 39 insertions(+), 2 deletions(-)
 rename {scripts => release}/contributors (100%)
 create mode 100644 release/pyinstaller-mitmdump.spec
 create mode 100644 release/pyinstaller-mitmproxy.spec

diff --git a/mitmdump b/mitmdump
index 5d2a9e443..da3c80e1c 100755
--- a/mitmdump
+++ b/mitmdump
@@ -16,7 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys, signal
-from libmproxy import proxy, dump, cmdline, version
+# The unneccesary console import here is to work around a bug in pyinstaller
+from libmproxy import proxy, dump, cmdline, version, console
 import argparse
 
 if __name__ == '__main__':
diff --git a/mitmproxy b/mitmproxy
index e4d72ed85..2d773c02e 100755
--- a/mitmproxy
+++ b/mitmproxy
@@ -66,7 +66,7 @@ if __name__ == '__main__':
         print >> sys.stderr, "Error: mitmproxy requires a UTF console environment."
         print >> sys.stderr, "Set your LANG enviroment variable to something like en_US.UTF-8"
         sys.exit(1)
-        
+
 
     m = console.ConsoleMaster(server, opts)
     try:
diff --git a/scripts/contributors b/release/contributors
similarity index 100%
rename from scripts/contributors
rename to release/contributors
diff --git a/release/pyinstaller-mitmdump.spec b/release/pyinstaller-mitmdump.spec
new file mode 100644
index 000000000..a1a9b9376
--- /dev/null
+++ b/release/pyinstaller-mitmdump.spec
@@ -0,0 +1,20 @@
+# -*- mode: python -*-
+
+# Copy into the pyinstaller directory
+# ./pyinstaller.py --clean -F ./pyinstaller-mitmdump.spec 
+
+a = Analysis(['/Users/aldo/git/public/mitmproxy/mitmdump'],
+             hiddenimports=["pyamf"],
+             hookspath=None,
+             runtime_hooks=None)
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='mitmdump',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )
diff --git a/release/pyinstaller-mitmproxy.spec b/release/pyinstaller-mitmproxy.spec
new file mode 100644
index 000000000..8de6d583c
--- /dev/null
+++ b/release/pyinstaller-mitmproxy.spec
@@ -0,0 +1,16 @@
+# -*- mode: python -*-
+a = Analysis(['/Users/aldo/git/public/mitmproxy/mitmproxy'],
+             hiddenimports=["pyamf"],
+             hookspath=None,
+             runtime_hooks=None)
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='mitmproxy',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )