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 -*- # -*- mode: python -*-
from glob import glob from glob import glob
block_cipher = None
a = Analysis(['./mitmdump'], a = Analysis(['./mitmdump'],
hiddenimports=[], hiddenimports=[],
hookspath=None, hookspath=None,
runtime_hooks=None, runtime_hooks=None,
excludes=None, excludes=None,
cipher=block_cipher,
) )
a.datas = Tree( a.datas = Tree(
"./libmproxy/onboarding/templates", "./libmproxy/onboarding/templates",
@ -18,8 +16,7 @@ a.datas += Tree(
"./libmproxy/onboarding/static", "./libmproxy/onboarding/static",
prefix="libmproxy/onboarding/static" prefix="libmproxy/onboarding/static"
) )
pyz = PYZ(a.pure, pyz = PYZ(a.pure)
cipher=block_cipher)
exe = EXE(pyz, exe = EXE(pyz,
a.scripts, a.scripts,
a.binaries, a.binaries,

View File

@ -1,14 +1,12 @@
# -*- mode: python -*- # -*- mode: python -*-
from glob import glob from glob import glob
block_cipher = None
a = Analysis(['./mitmproxy'], a = Analysis(['./mitmproxy'],
hiddenimports=[], hiddenimports=[],
hookspath=None, hookspath=None,
runtime_hooks=None, runtime_hooks=None,
excludes=None, excludes=None,
cipher=block_cipher,
) )
a.datas = Tree( a.datas = Tree(
"./libmproxy/onboarding/templates", "./libmproxy/onboarding/templates",
@ -18,8 +16,7 @@ a.datas += Tree(
"./libmproxy/onboarding/static", "./libmproxy/onboarding/static",
prefix="libmproxy/onboarding/static" prefix="libmproxy/onboarding/static"
) )
pyz = PYZ(a.pure, pyz = PYZ(a.pure)
cipher=block_cipher)
exe = EXE(pyz, exe = EXE(pyz,
a.scripts, a.scripts,
a.binaries, a.binaries,

View File

@ -1,14 +1,12 @@
# -*- mode: python -*- # -*- mode: python -*-
from glob import glob from glob import glob
block_cipher = None
a = Analysis(['./mitmweb'], a = Analysis(['./mitmweb'],
hiddenimports=[], hiddenimports=[],
hookspath=None, hookspath=None,
runtime_hooks=None, runtime_hooks=None,
excludes=None, excludes=None,
cipher=block_cipher,
) )
a.datas = Tree( a.datas = Tree(
"./libmproxy/onboarding/templates", "./libmproxy/onboarding/templates",
@ -26,8 +24,7 @@ a.datas += Tree(
"./libmproxy/web/static", "./libmproxy/web/static",
prefix="libmproxy/web/static" prefix="libmproxy/web/static"
) )
pyz = PYZ(a.pure, pyz = PYZ(a.pure)
cipher=block_cipher)
exe = EXE(pyz, exe = EXE(pyz,
a.scripts, a.scripts,
a.binaries, a.binaries,

View File

@ -26,17 +26,22 @@ fi
TMPDIR=./tmp TMPDIR=./tmp
PYINST_CMD=$1" -F --clean" PYINST_CMD=$1" -F --clean"
CACHE="~/Library/Application Support/pyinstaller"
rm -f dist/* rm -f dist/*
rm -rf $TMPDIR rm -rf $TMPDIR
rm -rf $CACHE
$PYINST_CMD ./release/mitmdump.spec $PYINST_CMD ./release/mitmdump.spec
echo "Running mitmdump..."
./dist/mitmdump --version || exit 1 ./dist/mitmdump --version || exit 1
$PYINST_CMD ./release/mitmproxy.spec $PYINST_CMD ./release/mitmproxy.spec
echo "Running mitmproxy..."
./dist/mitmproxy --version || exit 1 ./dist/mitmproxy --version || exit 1
$PYINST_CMD ./release/mitmweb.spec $PYINST_CMD ./release/mitmweb.spec
echo "Running mitmweb..."
./dist/mitmweb --version || exit 1 ./dist/mitmweb --version || exit 1
DST=osx-mitmproxy-`./dist/mitmdump --shortversion 2>&1` DST=osx-mitmproxy-`./dist/mitmdump --shortversion 2>&1`