Compare commits

...

3 Commits
master ... 7.0b

Author SHA1 Message Date
Stephen Anthony 2128ceb81a For Windows build, remove *all* DLL's before install, and only install
SDL2.dll.
2024-10-07 17:04:18 -02:30
Stephen Anthony 01702f1230 Re-add ZIP build for Windows. 2024-10-07 16:27:13 -02:30
Stephen Anthony 3dbdcd0682 Automatically remove old DLL's for Windows install.
This fixes exe not starting with latest release.
2024-10-06 20:36:06 -02:30
2 changed files with 35 additions and 9 deletions

View File

@ -1,17 +1,33 @@
@echo off & setlocal enableextensions @echo off & setlocal enableextensions
echo This will create an InnoSetup installer for 64-bit Stella. echo This will create an InnoSetup installer for 64-bit Stella
echo as well as a ZIP archive.
echo. echo.
echo ! InnoSetup must be linked to this directory as 'iscc.lnk' echo ! InnoSetup must be linked to this directory as 'iscc.lnk'
echo ! 'zip.exe' must be installed in this directory (for ZIP files)
echo. echo.
echo !!! Make sure the code has already been compiled in Visual Studio echo !!! Make sure the code has already been compiled in Visual Studio
echo !!! before launching this command. echo !!! before launching this command.
echo. echo.
:: Make sure InnoSetup is available :: Make sure all tools are available
set HAVE_ISCC=1
set HAVE_ZIP=1
:: Make sure InnoSetup and/or ZIP are available
if not exist "iscc.lnk" ( if not exist "iscc.lnk" (
echo InnoSetup 'iscc.lnk' not found echo InnoSetup 'iscc.lnk' not found - EXE files will not be created
goto done set HAVE_ISCC=0
)
if not exist "zip.exe" (
echo ZIP command not found - ZIP files will not be created
set HAVE_ZIP=0
)
if %HAVE_ISCC% == 0 (
if %HAVE_ZIP% == 0 (
echo Both EXE and ZIP files cannot be created, exiting
goto done
)
) )
set RELEASE=x64\Release set RELEASE=x64\Release
@ -36,10 +52,10 @@ mkdir %STELLA_DIR%\docs
echo Copying executable files ... echo Copying executable files ...
copy %RELEASE%\Stella.exe %STELLA_DIR% copy %RELEASE%\Stella.exe %STELLA_DIR%
copy %RELEASE%\*.dll %STELLA_DIR% copy %RELEASE%\SDL*.dll %STELLA_DIR%
echo Copying DOC files ... echo Copying DOC files ...
xcopy ..\..\..\docs\* %STELLA_DIR%\docs /s /q xcopy ..\..\..\docs\* %STELLA_DIR%\docs /s /q
copy ..\..\..\Announce.txt %STELLA_DIR%\docs copy ..\..\..\Announce.txt %STELLA_DIR%\docs
copy ..\..\..\Changes.txt %STELLA_DIR%\docs copy ..\..\..\Changes.txt %STELLA_DIR%\docs
copy ..\..\..\Copyright.txt %STELLA_DIR%\docs copy ..\..\..\Copyright.txt %STELLA_DIR%\docs
@ -54,9 +70,16 @@ if not exist Output (
mkdir Output mkdir Output
) )
:: Actually create the ZIP file
if %HAVE_ZIP% == 1 (
echo Creating ZIP file ...
zip -q -r Output\%STELLA_DIR%-windows.zip %STELLA_DIR%
)
:: Create the Inno EXE files :: Create the Inno EXE files
echo Creating InnoSetup EXE ... if %HAVE_ISCC% == 1 (
iscc.lnk "%CD%\stella.iss" /q "/dSTELLA_VER=%STELLA_VER%" "/dSTELLA_PATH=%STELLA_DIR%" "/dSTELLA_DOCPATH=%STELLA_DIR%\docs" echo Creating InnoSetup EXE ...
iscc.lnk "%CD%\stella.iss" /q "/dSTELLA_VER=%STELLA_VER%" "/dSTELLA_PATH=%STELLA_DIR%" "/dSTELLA_DOCPATH=%STELLA_DIR%\docs"
)
:: Cleanup time :: Cleanup time
echo Cleaning up files ... echo Cleaning up files ...

View File

@ -25,7 +25,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
[Files] [Files]
Source: "{#STELLA_PATH}\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "{#STELLA_PATH}\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#STELLA_PATH}\*.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "{#STELLA_PATH}\SDL*.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#STELLA_DOCPATH}\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#STELLA_DOCPATH}\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
@ -34,3 +34,6 @@ Name: "{group}\Stella"; Filename: "{app}\Stella.exe"; WorkingDir: "{app}"
Name: "{userdesktop}\Stella"; Filename: "{app}\Stella.exe"; WorkingDir: "{app}"; Tasks: desktopicon Name: "{userdesktop}\Stella"; Filename: "{app}\Stella.exe"; WorkingDir: "{app}"; Tasks: desktopicon
Name: "{group}\Documentation"; Filename: "{app}\docs\index.html" Name: "{group}\Documentation"; Filename: "{app}\docs\index.html"
Name: "{group}\Uninstall Stella"; Filename: "{uninstallexe}" Name: "{group}\Uninstall Stella"; Filename: "{uninstallexe}"
[InstallDelete]
Type: files; Name: "{app}\*.dll"