diff options
Diffstat (limited to 'release')
| -rwxr-xr-x | release/rtool.py | 31 | ||||
| -rw-r--r-- | release/specs/icon.ico | bin | 0 -> 365133 bytes | |||
| -rw-r--r-- | release/specs/mitmdump.spec | 3 | ||||
| -rw-r--r-- | release/specs/mitmproxy.spec | 3 | ||||
| -rw-r--r-- | release/specs/mitmweb.spec | 3 | ||||
| -rw-r--r-- | release/specs/pathoc.spec | 3 | ||||
| -rw-r--r-- | release/specs/pathod.spec | 3 |
7 files changed, 27 insertions, 19 deletions
diff --git a/release/rtool.py b/release/rtool.py index 5929452a..221ace0a 100755 --- a/release/rtool.py +++ b/release/rtool.py @@ -34,6 +34,7 @@ else: RELEASE_DIR = join(os.path.dirname(os.path.realpath(__file__))) DIST_DIR = join(RELEASE_DIR, "dist") ROOT_DIR = os.path.normpath(join(RELEASE_DIR, "..")) +RELEASE_SPEC_DIR = join(RELEASE_DIR, "specs") VERSION_FILE = join(ROOT_DIR, "netlib/version.py") BUILD_DIR = join(RELEASE_DIR, "build") @@ -226,20 +227,22 @@ def bdist(ctx, use_existing_wheels, pyinstaller_version): for bdist_project, tools in project["bdists"].items(): with Archive(join(DIST_DIR, archive_name(bdist_project))) as archive: for tool in tools: - spec = join(RELEASE_DIR, "specs/%s.spec" % tool) - print("Building %s binary..." % tool) - subprocess.check_call( - [ - VENV_PYINSTALLER, - "--clean", - "--workpath", PYINSTALLER_TEMP, - "--distpath", PYINSTALLER_DIST, - # This is PyInstaller, so setting a - # different log level obviously breaks it :-) - # "--log-level", "WARN", - spec - ] - ) + # This is PyInstaller, so it messes up paths. + # We need to make sure that we are in the spec folder. + with chdir(RELEASE_SPEC_DIR): + print("Building %s binary..." % tool) + subprocess.check_call( + [ + VENV_PYINSTALLER, + "--clean", + "--workpath", PYINSTALLER_TEMP, + "--distpath", PYINSTALLER_DIST, + # This is PyInstaller, so setting a + # different log level obviously breaks it :-) + # "--log-level", "WARN", + "%s.spec" % tool + ] + ) # Test if it works at all O:-) executable = join(PYINSTALLER_DIST, tool) diff --git a/release/specs/icon.ico b/release/specs/icon.ico Binary files differnew file mode 100644 index 00000000..bfd2fde7 --- /dev/null +++ b/release/specs/icon.ico diff --git a/release/specs/mitmdump.spec b/release/specs/mitmdump.spec index 149678df..fc145185 100644 --- a/release/specs/mitmdump.spec +++ b/release/specs/mitmdump.spec @@ -19,4 +19,5 @@ exe = EXE(pyz, debug=False, strip=None, upx=True, - console=True ) + console=True, + icon='icon.ico' ) diff --git a/release/specs/mitmproxy.spec b/release/specs/mitmproxy.spec index 1c481446..f7ea99f9 100644 --- a/release/specs/mitmproxy.spec +++ b/release/specs/mitmproxy.spec @@ -19,4 +19,5 @@ exe = EXE(pyz, debug=False, strip=None, upx=True, - console=True ) + console=True, + icon='icon.ico' ) diff --git a/release/specs/mitmweb.spec b/release/specs/mitmweb.spec index 79ccf71d..ea6192a4 100644 --- a/release/specs/mitmweb.spec +++ b/release/specs/mitmweb.spec @@ -19,4 +19,5 @@ exe = EXE(pyz, debug=False, strip=None, upx=True, - console=True ) + console=True, + icon='icon.ico' ) diff --git a/release/specs/pathoc.spec b/release/specs/pathoc.spec index 4f1f44be..d4f4d0d9 100644 --- a/release/specs/pathoc.spec +++ b/release/specs/pathoc.spec @@ -19,4 +19,5 @@ exe = EXE(pyz, debug=False, strip=None, upx=True, - console=True ) + console=True, + icon='icon.ico' ) diff --git a/release/specs/pathod.spec b/release/specs/pathod.spec index 3d2a8be2..f3a977f2 100644 --- a/release/specs/pathod.spec +++ b/release/specs/pathod.spec @@ -19,4 +19,5 @@ exe = EXE(pyz, debug=False, strip=None, upx=True, - console=True ) + console=True, + icon='icon.ico' ) |