From 57a23affd03b83b1b7616a0c63e8e91c3a891b02 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 29 Nov 2023 21:47:16 +0600 Subject: [PATCH] Adapt to changes in pyinstaller --- .appveyor.yml | 2 +- dist_assets/win/pyfa-setup.iss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2633fe2a8..4fe7754f6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -149,7 +149,7 @@ for: # Build gamedata DB - cmd: "python db_update.py" # Build command for PyInstaller - - cmd: "python -m PyInstaller --clean -y pyfa.spec" + - cmd: "python -m PyInstaller --contents-directory app --clean -y pyfa.spec" # Copy over manifest (See pyfa-org/pyfa#1622) - ps: xcopy /y dist_assets\win\pyfa.exe.manifest $env:PYFA_DIST_DIR\pyfa\ # InnoScript EXE building. This is in a separate script because I don't feel like copying over the logic to AppVeyor script right now... diff --git a/dist_assets/win/pyfa-setup.iss b/dist_assets/win/pyfa-setup.iss index fde2c47b6..ecc2cdd8c 100644 --- a/dist_assets/win/pyfa-setup.iss +++ b/dist_assets/win/pyfa-setup.iss @@ -42,10 +42,10 @@ CloseApplications=yes DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes -LicenseFile={#MyAppDir}\LICENSE +LicenseFile={#MyAppDir}\app\LICENSE OutputDir={#MyOutputDir} OutputBaseFilename={#MyOutputFile} -SetupIconFile={#MyAppDir}\pyfa.ico +SetupIconFile={#MyAppDir}\app\pyfa.ico SolidCompression=yes [Languages]