Update for latest master of PyInstaller

This commit is contained in:
Aldo Cortesi 2015-03-12 13:26:21 +11:00
parent a8c074054a
commit dfc1b39164
4 changed files with 11 additions and 15 deletions

View File

@ -1,14 +1,12 @@
# -*- 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",
@ -18,8 +16,7 @@ a.datas += Tree(
"./libmproxy/onboarding/static",
prefix="libmproxy/onboarding/static"
)
pyz = PYZ(a.pure,
cipher=block_cipher)
pyz = PYZ(a.pure)
exe = EXE(pyz,
a.scripts,
a.binaries,

View File

@ -1,14 +1,12 @@
# -*- 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",
@ -18,8 +16,7 @@ a.datas += Tree(
"./libmproxy/onboarding/static",
prefix="libmproxy/onboarding/static"
)
pyz = PYZ(a.pure,
cipher=block_cipher)
pyz = PYZ(a.pure)
exe = EXE(pyz,
a.scripts,
a.binaries,

View File

@ -1,14 +1,12 @@
# -*- 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",
@ -26,8 +24,7 @@ a.datas += Tree(
"./libmproxy/web/static",
prefix="libmproxy/web/static"
)
pyz = PYZ(a.pure,
cipher=block_cipher)
pyz = PYZ(a.pure)
exe = EXE(pyz,
a.scripts,
a.binaries,

View File

@ -4,12 +4,12 @@
# A few quirks to note, which should be re-checked every release:
# - We require the latest development version of PyInstaller.
# To run, first install netlib and mitmproxy, then run
# To run, first install netlib and mitmproxy, then run
#
# ./release/osx-binaries
#
# From the top-level mitmproxy directory.
# From the top-level mitmproxy directory.
usage ()
{
@ -26,17 +26,22 @@ fi
TMPDIR=./tmp
PYINST_CMD=$1" -F --clean"
CACHE="~/Library/Application Support/pyinstaller"
rm -f dist/*
rm -rf $TMPDIR
rm -rf $CACHE
$PYINST_CMD ./release/mitmdump.spec
echo "Running mitmdump..."
./dist/mitmdump --version || exit 1
$PYINST_CMD ./release/mitmproxy.spec
echo "Running mitmproxy..."
./dist/mitmproxy --version || exit 1
$PYINST_CMD ./release/mitmweb.spec
echo "Running mitmweb..."
./dist/mitmweb --version || exit 1
DST=osx-mitmproxy-`./dist/mitmdump --shortversion 2>&1`