Merge branch 'master' of github.com:mitmproxy/mitmproxy

5 files changed, 150 insertions, 34 deletions

diff --git a/release/mitmdump.spec b/release/mitmdump.spec
new file mode 100644
index 00000000..a84908f5
--- /dev/null
+++ b/release/mitmdump.spec
@@ -0,0 +1,32 @@
+# -*- mode: python -*-
+
+from glob import glob
+block_cipher = None
+
+a = Analysis(['./mitmdump'],
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None,
+             excludes=None,
+             cipher=block_cipher,
+          )
+a.datas = Tree(
+  "./libmproxy/onboarding/templates",
+  prefix="libmproxy/onboarding/templates"
+)
+a.datas += Tree(
+  "./libmproxy/onboarding/static",
+  prefix="libmproxy/onboarding/static"
+)
+pyz = PYZ(a.pure,
+             cipher=block_cipher)
+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/mitmproxy.spec b/release/mitmproxy.spec
new file mode 100644
index 00000000..546c2899
--- /dev/null
+++ b/release/mitmproxy.spec
@@ -0,0 +1,32 @@
+# -*- mode: python -*-
+
+from glob import glob
+block_cipher = None
+
+a = Analysis(['./mitmproxy'],
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None,
+             excludes=None,
+             cipher=block_cipher,
+          )
+a.datas = Tree(
+  "./libmproxy/onboarding/templates",
+  prefix="libmproxy/onboarding/templates"
+)
+a.datas += Tree(
+  "./libmproxy/onboarding/static",
+  prefix="libmproxy/onboarding/static"
+)
+pyz = PYZ(a.pure,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='mitmproxy',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )
diff --git a/release/mitmweb.spec b/release/mitmweb.spec
new file mode 100644
index 00000000..4e99da38
--- /dev/null
+++ b/release/mitmweb.spec
@@ -0,0 +1,40 @@
+# -*- mode: python -*-
+
+from glob import glob
+block_cipher = None
+
+a = Analysis(['./mitmweb'],
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None,
+             excludes=None,
+             cipher=block_cipher,
+          )
+a.datas = Tree(
+  "./libmproxy/onboarding/templates",
+  prefix="libmproxy/onboarding/templates"
+)
+a.datas += Tree(
+  "./libmproxy/onboarding/static",
+  prefix="libmproxy/onboarding/static"
+)
+a.datas += Tree(
+  "./libmproxy/web/templates",
+  prefix="libmproxy/web/templates"
+)
+a.datas += Tree(
+  "./libmproxy/web/static",
+  prefix="libmproxy/web/static"
+)
+pyz = PYZ(a.pure,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='mitmweb',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )
diff --git a/release/osx-binaries b/release/osx-binaries
index 9945e471..862ddd59 100755
--- a/release/osx-binaries
+++ b/release/osx-binaries
@@ -5,27 +5,45 @@
 # A few quirks to note, which should be re-checked every release:
 # - We require the latest development version of PyInstaller.
  
-# - PyInstaller has trouble detecting the zope.interfaces package. This is
-# required by Twisted, which for mysterious reasons is required by Urwid. The
-# answer is to touch the __init__.py file in the zope directory. On my system:
-#   touch /Library/Python/2.7/site-packages/zope/__init__.py
+# To run, first install netlib and mitmproxy, then run 
+#
+#	./release/osx-binaries
+#
+# From the top-level mitmproxy directory. 
 
-# To run, first install netlib and mitmproxy, then change into the pyinstaller
-# directory, and then run this script.
+usage ()
+{
+  echo 'Usage : ./release/osx-binaries /path/to/pyinstaller.py'
+  echo 'Run from the top-level mitmproxy directory'
+  exit
+}
 
-DST=/tmp/osx-mitmproxy
-MITMPROXY=~/mitmproxy/mitmproxy
-PYINST_CMD="./pyinstaller.py -F --clean"
+if [ "$1" = "" ]
+then
+    usage
+fi
 
-rm -rf $DST
-mkdir -p $DST
-rm -rf mitmproxy
-rm -rf mitmdump
 
-$PYINST_CMD $MITMPROXY/mitmproxy
-cp mitmproxy/dist/mitmproxy $DST
+TMPDIR=./tmp
+PYINST_CMD=$1" -F --clean"
 
-$PYINST_CMD $MITMPROXY/mitmdump
-cp mitmdump/dist/mitmdump $DST
+rm -f dist/*
+rm -rf $TMPDIR
 
-cshape $MITMPROXY/doc-src $DST/doc
+$PYINST_CMD ./release/mitmdump.spec
+./dist/mitmdump --version || exit 1
+
+$PYINST_CMD ./release/mitmproxy.spec
+./dist/mitmproxy --version || exit 1
+
+$PYINST_CMD ./release/mitmweb.spec
+./dist/mitmweb --version || exit 1
+
+DST=osx-mitmproxy-`./dist/mitmdump --shortversion 2>&1`
+mkdir -p $TMPDIR/$DST
+cp ./dist/mitmproxy $TMPDIR/$DST
+cp ./dist/mitmdump $TMPDIR/$DST
+cshape ./doc-src $TMPDIR/$DST/doc
+
+cd $TMPDIR
+tar -czvf $DST.tar.gz $DST
diff --git a/release/release-checklist b/release/release-checklist
index 31a1a48f..154103e9 100644
--- a/release/release-checklist
+++ b/release/release-checklist
@@ -1,5 +1,5 @@
 
-- Bump the version number: 
+- Check the version number:
 
     mitmproxy/libmproxy/version.py
     netlib/netlib/version.py
@@ -11,30 +11,24 @@
 - Run the test release, make sure the output is sensible
     ./release/test-release
 
-- Build sdist packages:
-    python ./setup.py sdist
-
-- Test the packages by installing in a virtualenv:
-    - cd dist
-    - tar -xzvf pkgfile.tgz
-    - virtualenv venv
-
 - Build the OSX binaries
     - Follow instructions in osxbinaries
-    - Package:
-        cp -r ./doc /tmp/osx-mitmproxy/
-        mv /tmp/osx-mitmproxy /tmp/osx-mitmproxy-VERSION
-        tar -czvf /tmp/osx-mitmproxy-VERSION.tar.gz /tmp/osx-mitmproxy-VERSION
-        mv /tmp/osx-mitmproxy-VERSION.tar.gz ~/mitmproxy/www.mitmproxy.org/src/download
+    - Move to download dir:
+        mv ./tmp/osx-mitmproxy-VERSION.tar.gz ~/mitmproxy/www.mitmproxy.org/src/download
 
 - Build the sources for each project:
     python ./setup.py sdist
     mv ./dist/FILE ~/mitmproxy/www.mitmproxy.org/src/download
 
-
-- Adjust links on www.mitmproxy.org
+- Tag with the version number, and do: 
+    git push --tags
 
 - Upload to pypi for each project:
 
     python ./setup.py sdist upload
 
+- Now bump the version number to be ready for the next cycle: 
+
+    mitmproxy/libmproxy/version.py
+    netlib/netlib/version.py
+    pathod/libpathod/version.py