diff --git a/.gitignore b/.gitignore index c6ec187..445bc12 100644 --- a/.gitignore +++ b/.gitignore @@ -22,8 +22,7 @@ pppppppp.txt fnf-porter.log ## PyInstaller -build/ -dist/ +export/ ## FNF Porter files **/logs/* diff --git a/build.bat b/build.bat index 7d16082..b2757d4 100644 --- a/build.bat +++ b/build.bat @@ -1 +1 @@ -pyinstaller build.spec \ No newline at end of file +pyinstaller build.spec --distpath ./export/bin --workpath ./export/obj \ No newline at end of file diff --git a/build.spec b/build.spec index 62b2236..832fe15 100644 --- a/build.spec +++ b/build.spec @@ -2,17 +2,17 @@ a = Analysis( - ['psychtobase\\main.py'], - pathex=[], - binaries=[], - datas=[], - hiddenimports=[], - hookspath=[], - hooksconfig={}, - runtime_hooks=[], - excludes=[], - noarchive=False, - optimize=0, + ['psychtobase\\main.py'], + pathex=[], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, + # optimize=0, Crashes for some reason :shrug: ) pyz = PYZ(a.pure) @@ -20,33 +20,33 @@ import platform iconArr = [] if platform.system() == 'Darwin': - iconArr = ['icon.icns'] + iconArr = ['icon.icns'] elif platform.system() == 'Windows': - iconArr = ['icon.ico'] + iconArr = ['icon.ico'] exe = EXE( - pyz, - a.scripts, - a.binaries, - a.datas, - [], - name='FNF Porter', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - upx_exclude=[], - runtime_tmpdir=None, - console=False, - disable_windowed_traceback=False, - argv_emulation=False, - target_arch=None, - codesign_identity=None, - entitlements_file=None, - icon=iconArr, + pyz, + a.scripts, + a.binaries, + a.datas, + [], + name='FNF Porter', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + upx_exclude=[], + runtime_tmpdir=None, + console=False, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, + icon=iconArr, ) import shutil if platform.system() == 'Windows': - shutil.copyfile('ffmpeg.exe', '{0}/ffmpeg.exe'.format(DISTPATH)) - shutil.copyfile('FFMPEG-LICENSE', '{0}/FFMPEG_LICENSE.txt'.format(DISTPATH)) \ No newline at end of file + shutil.copyfile('ffmpeg.exe', '{0}/ffmpeg.exe'.format(DISTPATH)) + shutil.copyfile('FFMPEG-LICENSE', '{0}/FFMPEG_LICENSE.txt'.format(DISTPATH)) \ No newline at end of file