Skip to content

Commit 784554b

Browse files
committed
chore: Built new exes
1 parent 4e9c740 commit 784554b

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ venv32/
1212
venv64/
1313
.pytest_cache/
1414
.cache/
15-
extractor.spec
15+
extractor.spec
16+
tmp-requirements.txt

CONTRIBUTING.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,24 @@
33
Here's how to run all the development stuff.
44

55
## Setup Development Environment
6-
* `pyenv global 3.6.8-amd64`
6+
* `pyenv global 3.7.6-amd64`
77
* `pipenv install --dev`
88

99
## Building
1010

11-
Building is a little convoluted because we build a x64 and an x86 binary...
11+
Building is a little convoluted because we build a x64 and an x86 binary, because we don't have it in the Pipfile because it didn't play nicely with CI the last time I tried, and `pipenv` doesn't play nicely with bitness.
1212

13-
* `pyenv global 3.6.8-amd64`
14-
* Originally wasn't able to get this to run on Python 3.7 when it was new, but 3.6 is guarenteed to build the `.exe`
15-
* `pyenv exec python -m venv venv64`
16-
* `venv64\scripts\activate.bat` or `venv64/scripts/activate` for Linux
17-
* `pip install -r requirements-dev.txt` (Installs `pyinstaller` and `pytest`)
13+
If this project accumulates and Pipfile dependencies that `pyinstaller` needs to know about, we either have to stop using `pipenv` or find a new way to manage this...
14+
15+
EDIT: `pipenv` is apparently dead? No new releases? So... don't use it to build with for now...
16+
17+
* `pyenv global 3.7.6-amd64`
18+
* `pipenv run pip freeze > tmp-requirements.txt`
19+
* `pip install -r tmp-requirements.txt`
20+
* `pip install pyinstaller`
21+
* pyinstaller is a slower dependency so might not work with the latest Python
1822
* `python build_exe.py`
19-
* `venv64\scripts\deactivate.bat` (or you'll use the wrong python when you make another `venv`)
20-
* Do the same with `pyenv and 3.6.8` and make a folder called `venv32` instead
23+
* Do the same with `pyenv global 3.7.6` (without `-amd64` suffix) to build the x86 .exe
2124

2225
## Testing
2326
* `pipenv run pytest -v` in the root directory

build_exe.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
is64bit = sys.maxsize > 2**32
99

1010
#Run pyinstaller
11+
#shell=True with pyenv... gets mad otherwise
1112
subprocess.run(["pyinstaller", "unitypackage_extractor/extractor.py",
1213
"--exclude-module", "ssl",
13-
"--exclude-module", "socket"])
14+
"--exclude-module", "socket"], shell=True)
1415

1516
#Zip it all up
1617
shutil.make_archive(f"unitypackage_extractor_{'64' if is64bit else '32'}", "zip", "dist/extractor")

unitypackage_extractor_32.zip

478 KB
Binary file not shown.

unitypackage_extractor_64.zip

694 KB
Binary file not shown.

0 commit comments

Comments
 (0)