From f42af9061220ec0373e94e96b69434575f60281d Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 18 Feb 2016 11:25:29 +0100 Subject: move bin into release, update rtool --- release/.env | 6 ------ release/.gitignore | 9 --------- release/mitmdump.spec | 22 ---------------------- release/mitmproxy.spec | 22 ---------------------- release/mitmweb.spec | 22 ---------------------- release/pathoc.spec | 22 ---------------------- release/pathod.spec | 22 ---------------------- release/rtool.py | 2 +- release/specs/mitmdump | 3 +++ release/specs/mitmdump.spec | 22 ++++++++++++++++++++++ release/specs/mitmproxy | 3 +++ release/specs/mitmproxy.spec | 22 ++++++++++++++++++++++ release/specs/mitmweb | 4 ++++ release/specs/mitmweb.spec | 22 ++++++++++++++++++++++ release/specs/pathoc | 6 ++++++ release/specs/pathoc.spec | 22 ++++++++++++++++++++++ release/specs/pathod | 6 ++++++ release/specs/pathod.spec | 22 ++++++++++++++++++++++ 18 files changed, 133 insertions(+), 126 deletions(-) delete mode 100644 release/.env delete mode 100644 release/.gitignore delete mode 100644 release/mitmdump.spec delete mode 100644 release/mitmproxy.spec delete mode 100644 release/mitmweb.spec delete mode 100644 release/pathoc.spec delete mode 100644 release/pathod.spec create mode 100644 release/specs/mitmdump create mode 100644 release/specs/mitmdump.spec create mode 100644 release/specs/mitmproxy create mode 100644 release/specs/mitmproxy.spec create mode 100644 release/specs/mitmweb create mode 100644 release/specs/mitmweb.spec create mode 100644 release/specs/pathoc create mode 100644 release/specs/pathoc.spec create mode 100644 release/specs/pathod create mode 100644 release/specs/pathod.spec (limited to 'release') diff --git a/release/.env b/release/.env deleted file mode 100644 index 69ac3f05..00000000 --- a/release/.env +++ /dev/null @@ -1,6 +0,0 @@ -DIR="$( dirname "${BASH_SOURCE[0]}" )" -ACTIVATE_DIR="$(if [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)" -if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" ]; then - echo "Activating mitmproxy virtualenv..." - source "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" -fi diff --git a/release/.gitignore b/release/.gitignore deleted file mode 100644 index c062fb3b..00000000 --- a/release/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -.DS_Store -MANIFEST -*.py[cdo] -*.swp -*.swo - -/build -/dist -/mitmproxy_rtool.egg-info \ No newline at end of file diff --git a/release/mitmdump.spec b/release/mitmdump.spec deleted file mode 100644 index 967f5e58..00000000 --- a/release/mitmdump.spec +++ /dev/null @@ -1,22 +0,0 @@ -# -*- mode: python -*- - -from PyInstaller.utils.hooks import collect_data_files - -a = Analysis(['../mitmproxy/mitmdump'], - binaries=None, - datas=collect_data_files("mitmproxy.onboarding"), - hiddenimports=[], - hookspath=None, - runtime_hooks=None, - excludes=None) -pyz = PYZ(a.pure, a.zipped_data) -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 deleted file mode 100644 index 6356b0a6..00000000 --- a/release/mitmproxy.spec +++ /dev/null @@ -1,22 +0,0 @@ -# -*- mode: python -*- - -from PyInstaller.utils.hooks import collect_data_files - -a = Analysis(['../mitmproxy/mitmproxy'], - binaries=None, - datas=collect_data_files("mitmproxy.onboarding"), - hiddenimports=[], - hookspath=None, - runtime_hooks=None, - excludes=None) -pyz = PYZ(a.pure, a.zipped_data) -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 deleted file mode 100644 index e3e634fa..00000000 --- a/release/mitmweb.spec +++ /dev/null @@ -1,22 +0,0 @@ -# -*- mode: python -*- - -from PyInstaller.utils.hooks import collect_data_files - -a = Analysis(['../mitmproxy/mitmweb'], - binaries=None, - datas=collect_data_files("mitmproxy"), - hiddenimports=[], - hookspath=None, - runtime_hooks=None, - excludes=None) -pyz = PYZ(a.pure, a.zipped_data) -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/pathoc.spec b/release/pathoc.spec deleted file mode 100644 index 707d21de..00000000 --- a/release/pathoc.spec +++ /dev/null @@ -1,22 +0,0 @@ -# -*- mode: python -*- - -from PyInstaller.utils.hooks import collect_data_files - -a = Analysis(['../pathod/pathoc'], - binaries=None, - datas=None, - hiddenimports=['_cffi_backend'], - hookspath=None, - runtime_hooks=None, - excludes=None) -pyz = PYZ(a.pure, a.zipped_data) -exe = EXE(pyz, - a.scripts, - a.binaries, - a.zipfiles, - a.datas, - name='pathoc', - debug=False, - strip=None, - upx=True, - console=True ) diff --git a/release/pathod.spec b/release/pathod.spec deleted file mode 100644 index 4e515ac9..00000000 --- a/release/pathod.spec +++ /dev/null @@ -1,22 +0,0 @@ -# -*- mode: python -*- - -from PyInstaller.utils.hooks import collect_data_files - -a = Analysis(['../pathod/pathod'], - binaries=None, - datas=collect_data_files("libpathod"), - hiddenimports=['_cffi_backend'], - hookspath=None, - runtime_hooks=None, - excludes=None) -pyz = PYZ(a.pure, a.zipped_data) -exe = EXE(pyz, - a.scripts, - a.binaries, - a.zipfiles, - a.datas, - name='pathod', - debug=False, - strip=None, - upx=True, - console=True ) diff --git a/release/rtool.py b/release/rtool.py index 936e64c8..2ebb3a1c 100644 --- a/release/rtool.py +++ b/release/rtool.py @@ -242,7 +242,7 @@ def bdist(ctx, use_existing_wheels, pyinstaller_version): if conf["tools"]: with Archive(join(DIST_DIR, archive_name(p))) as archive: for tool in conf["tools"]: - spec = join(RELEASE_DIR, "%s.spec" % tool) + spec = join(RELEASE_DIR, "specs/%s.spec" % tool) print("Building %s binary..." % tool) subprocess.check_call( [ diff --git a/release/specs/mitmdump b/release/specs/mitmdump new file mode 100644 index 00000000..2483be4f --- /dev/null +++ b/release/specs/mitmdump @@ -0,0 +1,3 @@ +#!/usr/bin/env python +from mitmproxy.main import mitmdump +mitmdump() diff --git a/release/specs/mitmdump.spec b/release/specs/mitmdump.spec new file mode 100644 index 00000000..149678df --- /dev/null +++ b/release/specs/mitmdump.spec @@ -0,0 +1,22 @@ +# -*- mode: python -*- + +from PyInstaller.utils.hooks import collect_data_files + +a = Analysis(['mitmdump'], + binaries=None, + datas=collect_data_files("mitmproxy.onboarding"), + hiddenimports=[], + hookspath=None, + runtime_hooks=None, + excludes=None) +pyz = PYZ(a.pure, a.zipped_data) +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/specs/mitmproxy b/release/specs/mitmproxy new file mode 100644 index 00000000..a3d7615d --- /dev/null +++ b/release/specs/mitmproxy @@ -0,0 +1,3 @@ +#!/usr/bin/env python +from mitmproxy.main import mitmproxy +mitmproxy() diff --git a/release/specs/mitmproxy.spec b/release/specs/mitmproxy.spec new file mode 100644 index 00000000..1c481446 --- /dev/null +++ b/release/specs/mitmproxy.spec @@ -0,0 +1,22 @@ +# -*- mode: python -*- + +from PyInstaller.utils.hooks import collect_data_files + +a = Analysis(['mitmproxy'], + binaries=None, + datas=collect_data_files("mitmproxy.onboarding"), + hiddenimports=[], + hookspath=None, + runtime_hooks=None, + excludes=None) +pyz = PYZ(a.pure, a.zipped_data) +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/specs/mitmweb b/release/specs/mitmweb new file mode 100644 index 00000000..14188a33 --- /dev/null +++ b/release/specs/mitmweb @@ -0,0 +1,4 @@ +#!/usr/bin/env python +from mitmproxy.main import mitmweb + +mitmweb() diff --git a/release/specs/mitmweb.spec b/release/specs/mitmweb.spec new file mode 100644 index 00000000..79ccf71d --- /dev/null +++ b/release/specs/mitmweb.spec @@ -0,0 +1,22 @@ +# -*- mode: python -*- + +from PyInstaller.utils.hooks import collect_data_files + +a = Analysis(['mitmweb'], + binaries=None, + datas=collect_data_files("mitmproxy"), + hiddenimports=[], + hookspath=None, + runtime_hooks=None, + excludes=None) +pyz = PYZ(a.pure, a.zipped_data) +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/specs/pathoc b/release/specs/pathoc new file mode 100644 index 00000000..ab62d631 --- /dev/null +++ b/release/specs/pathoc @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +from pathod import pathoc_cmdline as cmdline + +if __name__ == "__main__": + cmdline.go_pathoc() diff --git a/release/specs/pathoc.spec b/release/specs/pathoc.spec new file mode 100644 index 00000000..4f1f44be --- /dev/null +++ b/release/specs/pathoc.spec @@ -0,0 +1,22 @@ +# -*- mode: python -*- + +from PyInstaller.utils.hooks import collect_data_files + +a = Analysis(['pathoc'], + binaries=None, + datas=None, + hiddenimports=['_cffi_backend'], + hookspath=None, + runtime_hooks=None, + excludes=None) +pyz = PYZ(a.pure, a.zipped_data) +exe = EXE(pyz, + a.scripts, + a.binaries, + a.zipfiles, + a.datas, + name='pathoc', + debug=False, + strip=None, + upx=True, + console=True ) diff --git a/release/specs/pathod b/release/specs/pathod new file mode 100644 index 00000000..af0c118b --- /dev/null +++ b/release/specs/pathod @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +from pathod import pathod_cmdline as cmdline + +if __name__ == "__main__": + cmdline.go_pathod() diff --git a/release/specs/pathod.spec b/release/specs/pathod.spec new file mode 100644 index 00000000..3d2a8be2 --- /dev/null +++ b/release/specs/pathod.spec @@ -0,0 +1,22 @@ +# -*- mode: python -*- + +from PyInstaller.utils.hooks import collect_data_files + +a = Analysis(['pathod'], + binaries=None, + datas=collect_data_files("pathod"), + hiddenimports=['_cffi_backend'], + hookspath=None, + runtime_hooks=None, + excludes=None) +pyz = PYZ(a.pure, a.zipped_data) +exe = EXE(pyz, + a.scripts, + a.binaries, + a.zipfiles, + a.datas, + name='pathod', + debug=False, + strip=None, + upx=True, + console=True ) -- cgit v1.2.3