Merge branch 'master' into 0.10

3 files changed, 23 insertions, 36 deletions

diff --git a/release/osx-binaries b/release/osx-binaries
new file mode 100755
index 00000000..a5f17ba5
--- /dev/null
+++ b/release/osx-binaries
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Quick and dangerous script for building OSX binaries.
+
+# First, have a recent checkout of the dev version of pyinstaller. Change into
+# the pyinstaller directory, and then run this script.
+
+DST=/tmp/osx-mitmproxy
+MITMPROXY=~/mitmproxy/mitmproxy
+PYINST_CMD="./pyinstaller.py -F --clean"
+
+rm -rf $DST
+mkdir -p $DST
+rm -rf mitmproxy
+rm -rf mitmdump
+
+$PYINST_CMD $MITMPROXY/mitmproxy
+cp mitmproxy/dist/mitmproxy $DST
+
+$PYINST_CMD $MITMPROXY/mitmdump
+cp mitmdump/dist/mitmdump $DST
+
+cshape $MITMPROXY/doc-src $DST/doc
diff --git a/release/pyinstaller-mitmdump.spec b/release/pyinstaller-mitmdump.spec
deleted file mode 100644
index a1a9b937..00000000
--- a/release/pyinstaller-mitmdump.spec
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- 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
deleted file mode 100644
index 8de6d583..00000000
--- a/release/pyinstaller-mitmproxy.spec
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- 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 )