From a386dff058e7a80b7c3b5bab7e127e694ea60276 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 16 Jun 2013 15:13:28 +1200
Subject: Remove pyinstaller specs. Add a quick-and-dirty script for building
 OSX binaries.

---
 release/osx-binaries               | 16 ++++++++++++++++
 release/pyinstaller-mitmdump.spec  | 20 --------------------
 release/pyinstaller-mitmproxy.spec | 16 ----------------
 3 files changed, 16 insertions(+), 36 deletions(-)
 create mode 100755 release/osx-binaries
 delete mode 100644 release/pyinstaller-mitmdump.spec
 delete mode 100644 release/pyinstaller-mitmproxy.spec

(limited to 'release')

diff --git a/release/osx-binaries b/release/osx-binaries
new file mode 100755
index 00000000..651b6bf3
--- /dev/null
+++ b/release/osx-binaries
@@ -0,0 +1,16 @@
+#!/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.
+
+mkdir -p /tmp/osx-mitmproxy
+rm -rf mitmproxy
+rm -rf mitmdump
+
+./pyinstaller.py -F ~/mitmproxy/mitmproxy/mitmproxy
+cp mitmproxy/dist/mitmproxy /tmp/osx-mitmproxy
+
+./pyinstaller.py -F ~/mitmproxy/mitmproxy/mitmdump
+cp mitmdump/dist/mitmdump /tmp/osx-mitmproxy
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 )
-- 
cgit v1.2.3


From c89378047b9af7e54afdfd0efcb4215e090856bd Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 16 Jun 2013 15:50:08 +1200
Subject: Formalize OSX binary script a bit more.

---
 release/osx-binaries | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'release')

diff --git a/release/osx-binaries b/release/osx-binaries
index 651b6bf3..a5f17ba5 100755
--- a/release/osx-binaries
+++ b/release/osx-binaries
@@ -5,12 +5,19 @@
 # First, have a recent checkout of the dev version of pyinstaller. Change into
 # the pyinstaller directory, and then run this script.
 
-mkdir -p /tmp/osx-mitmproxy
+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
 
-./pyinstaller.py -F ~/mitmproxy/mitmproxy/mitmproxy
-cp mitmproxy/dist/mitmproxy /tmp/osx-mitmproxy
+$PYINST_CMD $MITMPROXY/mitmproxy
+cp mitmproxy/dist/mitmproxy $DST
+
+$PYINST_CMD $MITMPROXY/mitmdump
+cp mitmdump/dist/mitmdump $DST
 
-./pyinstaller.py -F ~/mitmproxy/mitmproxy/mitmdump
-cp mitmdump/dist/mitmdump /tmp/osx-mitmproxy
+cshape $MITMPROXY/doc-src $DST/doc
-- 
cgit v1.2.3