move bin into release, update rtool

mitmproxy/setup.py

@@ -79,7 +79,7 @@ setup(
         # Do not use a range operator here: https://bitbucket.org/pypa/setuptools/issues/380
         # Ubuntu Trusty and other still ship with setuptools < 17.1
         ':python_version == "2.7"': [
-            "enum34>=1.0.4, <1.1",
+            "enum34>=1.0.4, <2",
         ],
         'dev': [
             "mock>=1.3.0, <1.4",

release/.env

@@ -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

release/.gitignore

@@ -1,9 +0,0 @@
-.DS_Store
-MANIFEST
-*.py[cdo]
-*.swp
-*.swo
-
-/build
-/dist
-/mitmproxy_rtool.egg-info

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(
                         [

release/specs/mitmdump.spec

@@ -2,7 +2,7 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../mitmproxy/mitmdump'],
+a = Analysis(['mitmdump'],
              binaries=None,
              datas=collect_data_files("mitmproxy.onboarding"),
              hiddenimports=[],

release/specs/mitmproxy.spec

@@ -2,7 +2,7 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../mitmproxy/mitmproxy'],
+a = Analysis(['mitmproxy'],
              binaries=None,
              datas=collect_data_files("mitmproxy.onboarding"),
              hiddenimports=[],

release/specs/mitmweb.spec

@@ -2,7 +2,7 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../mitmproxy/mitmweb'],
+a = Analysis(['mitmweb'],
              binaries=None,
              datas=collect_data_files("mitmproxy"),
              hiddenimports=[],

release/specs/pathoc.spec

@@ -2,7 +2,7 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../pathod/pathoc'],
+a = Analysis(['pathoc'],
              binaries=None,
              datas=None,
              hiddenimports=['_cffi_backend'],

release/specs/pathod.spec

@@ -2,9 +2,9 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../pathod/pathod'],
+a = Analysis(['pathod'],
              binaries=None,
-             datas=collect_data_files("libpathod"),
+             datas=collect_data_files("pathod"),
              hiddenimports=['_cffi_backend'],
              hookspath=None,
              runtime_hooks=None,