diff --git a/.github/workflows/pyinstaller-win-alpha.yml b/.github/workflows/pyinstaller-win-alpha.yml index 8afe02cdb..e40d8ac0c 100644 --- a/.github/workflows/pyinstaller-win-alpha.yml +++ b/.github/workflows/pyinstaller-win-alpha.yml @@ -30,7 +30,7 @@ jobs: - name: Make package shell: cmd run: | - venv64\Scripts\pyinstaller .\main.spec --onefile + venv64\Scripts\pyinstaller .\main.spec md public move dist\main.exe public\arknights_mower.exe - name: Package into zip diff --git a/.github/workflows/pyinstaller-win.yml b/.github/workflows/pyinstaller-win.yml index 26fdf0634..4530a17c1 100644 --- a/.github/workflows/pyinstaller-win.yml +++ b/.github/workflows/pyinstaller-win.yml @@ -30,7 +30,7 @@ jobs: - name: Make package shell: cmd run: | - venv64\Scripts\pyinstaller .\main.spec --onefile + venv64\Scripts\pyinstaller .\main.spec md public move dist\main.exe public\arknights_mower.exe - name: Package into zip diff --git a/arknights_mower/__init__.py b/arknights_mower/__init__.py index 41895953a..ddc5cc991 100644 --- a/arknights_mower/__init__.py +++ b/arknights_mower/__init__.py @@ -15,4 +15,4 @@ __cli__ = not (__pyinstall__ and not sys.argv[1:]) __system__ = platform.system().lower() -__version__ = '2.0.6' +__version__ = '2.0.7' diff --git a/logo.ico b/logo.ico new file mode 100644 index 000000000..c36992b66 Binary files /dev/null and b/logo.ico differ diff --git a/main.spec b/main.spec index 723daa6fd..4aa92fd19 100644 --- a/main.spec +++ b/main.spec @@ -4,45 +4,49 @@ block_cipher = None -a = Analysis(['main.py'], - binaries=[], - datas=[ - ('arknights_mower/fonts', 'arknights_mower/__init__/fonts'), - ('arknights_mower/models', 'arknights_mower/__init__/models'), - ('arknights_mower/templates', 'arknights_mower/__init__/templates'), - ('arknights_mower/resources', 'arknights_mower/__init__/resources'), - ('arknights_mower/data', 'arknights_mower/__init__/data'), - ('arknights_mower/vendor', 'arknights_mower/__init__/vendor'), - ('venv64/Lib/site-packages/onnxruntime/capi/onnxruntime_providers_shared.dll', 'onnxruntime/capi/'), - ], - hiddenimports=[], - hookspath=[], - hooksconfig={}, - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - cipher=block_cipher, - noarchive=False) +a = Analysis( + ['main.py'], + pathex=[], + binaries=[], + datas=[ + ('arknights_mower/fonts', 'arknights_mower/__init__/fonts'), + ('arknights_mower/models', 'arknights_mower/__init__/models'), + ('arknights_mower/templates', 'arknights_mower/__init__/templates'), + ('arknights_mower/resources', 'arknights_mower/__init__/resources'), + ('arknights_mower/data', 'arknights_mower/__init__/data'), + ('arknights_mower/vendor', 'arknights_mower/__init__/vendor'), + ('venv64/Lib/site-packages/onnxruntime/capi/onnxruntime_providers_shared.dll', 'onnxruntime/capi/'), + ], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=False, +) +pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) -pyz = PYZ(a.pure, a.zipped_data, - cipher=block_cipher) - -exe = EXE(pyz, - a.scripts, - a.binaries, - a.zipfiles, - a.datas, - [], - name='main', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - upx_exclude=[], - runtime_tmpdir=None, - console=True, - disable_windowed_traceback=False, - target_arch=None, - codesign_identity=None, - entitlements_file=None ) +exe = EXE( + pyz, + a.scripts, + a.binaries, + a.zipfiles, + a.datas, + [], + name='main', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + upx_exclude=[], + runtime_tmpdir=None, + console=True, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, +)