diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2013-05-15 11:25:25 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2013-05-15 11:25:25 +1200 |
commit | 9e94fdc6db83bc2d11b6a9cd1df5222827df3ce8 (patch) | |
tree | 564fff39331e920e626696d30584e246058479eb | |
parent | 52b56e23b265006c29e73e6af37713331af7f5ac (diff) | |
download | mitmproxy-9e94fdc6db83bc2d11b6a9cd1df5222827df3ce8.tar.gz mitmproxy-9e94fdc6db83bc2d11b6a9cd1df5222827df3ce8.tar.bz2 mitmproxy-9e94fdc6db83bc2d11b6a9cd1df5222827df3ce8.zip |
Make ready for pyinstaller.
-rwxr-xr-x | mitmdump | 3 | ||||
-rwxr-xr-x | mitmproxy | 2 | ||||
-rwxr-xr-x | release/contributors (renamed from scripts/contributors) | 0 | ||||
-rw-r--r-- | release/pyinstaller-mitmdump.spec | 20 | ||||
-rw-r--r-- | release/pyinstaller-mitmproxy.spec | 16 |
5 files changed, 39 insertions, 2 deletions
@@ -16,7 +16,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import sys, signal -from libmproxy import proxy, dump, cmdline, version +# The unneccesary console import here is to work around a bug in pyinstaller +from libmproxy import proxy, dump, cmdline, version, console import argparse if __name__ == '__main__': @@ -66,7 +66,7 @@ if __name__ == '__main__': print >> sys.stderr, "Error: mitmproxy requires a UTF console environment." print >> sys.stderr, "Set your LANG enviroment variable to something like en_US.UTF-8" sys.exit(1) - + m = console.ConsoleMaster(server, opts) try: diff --git a/scripts/contributors b/release/contributors index a7518219..a7518219 100755 --- a/scripts/contributors +++ b/release/contributors diff --git a/release/pyinstaller-mitmdump.spec b/release/pyinstaller-mitmdump.spec new file mode 100644 index 00000000..a1a9b937 --- /dev/null +++ b/release/pyinstaller-mitmdump.spec @@ -0,0 +1,20 @@ +# -*- 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 new file mode 100644 index 00000000..8de6d583 --- /dev/null +++ b/release/pyinstaller-mitmproxy.spec @@ -0,0 +1,16 @@ +# -*- 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 ) |