[Scummvm-git-logs] scummvm master -> b2eeb9d03f5a09ebd7aa71efc8a49f1bc068ebc7

[lotharsm]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
2278f12938 DISTS: WIN32: Drop .html files from Inno Setup
b2eeb9d03f DISTS: WIN32: Use original win32dist directory as source for installation


Commit: 2278f12938bb8c0386424512b95c7cfd776c100f
    https://github.com/scummvm/scummvm/commit/2278f12938bb8c0386424512b95c7cfd776c100f
Author: Lothar Serra Mari (mail at serra.me)
Date: 2025-05-24T06:39:31+02:00

Commit Message:
DISTS: WIN32: Drop .html files from Inno Setup

Changed paths:
    dists/win32/ScummVM.iss


diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss
index a569b78a783..cdc3c4c86ac 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -111,10 +111,6 @@ Source: COPYING.txt; DestDir: {app}
 Source: COPYRIGHT.txt; DestDir: {app}
 Source: LICENSES\*; DestDir: {app}\LICENSES;
 
-; NEWS
-Source: NEWS.html; DestDir: {app}; Flags: ignoreversion; Languages: not german
-Source: NEUES.html; DestDir: {app}; Flags: ignoreversion; Languages: german
-
 ; QUICKSTART
 Source: doc/de/Schnellstart.txt; DestDir: {app}; Flags: ignoreversion; Languages: german
 Source: doc/es/InicioRapido.txt; DestDir: {app}; Flags: ignoreversion; Languages: spanish


Commit: b2eeb9d03f5a09ebd7aa71efc8a49f1bc068ebc7
    https://github.com/scummvm/scummvm/commit/b2eeb9d03f5a09ebd7aa71efc8a49f1bc068ebc7
Author: Lothar Serra Mari (mail at serra.me)
Date: 2025-05-24T06:53:06+02:00

Commit Message:
DISTS: WIN32: Use original win32dist directory as source for installation

Changed paths:
    dists/win32/ScummVM.iss


diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss
index cdc3c4c86ac..a3448b257be 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -94,6 +94,7 @@ Filename: {app}\ScummVM.exe; Parameters: "--no-console"; Flags: nowait skipifdoe
 Type: files; Name: {app}\SDL2.dll
 Type: files; Name: {app}\SDL2_net.dll
 Type: files; Name: {app}\discord-rpc.dll
+Type: files; Name: {app}\LICENSES
 
 [UninstallDelete]
 Type: files; Name: {app}\ISTool.url
@@ -105,32 +106,27 @@ Name: "{userappdata}\ScummVM"; MinVersion: 0, 1
 Name: "{userappdata}\ScummVM\Saved Games"; MinVersion: 0, 1; Flags: uninsneveruninstall
 
 [Files]
-; AUTHORS and LICENSING
-Source: AUTHORS.txt; DestDir: {app}
-Source: COPYING.txt; DestDir: {app}
-Source: COPYRIGHT.txt; DestDir: {app}
-Source: LICENSES\*; DestDir: {app}\LICENSES;
+; NEWS, README, AUTHORS, LICENSES...
+Source: ..\..\win32dist-mingw\*.txt; DestDir: {app}
 
 ; QUICKSTART
-Source: doc/de/Schnellstart.txt; DestDir: {app}; Flags: ignoreversion; Languages: german
-Source: doc/es/InicioRapido.txt; DestDir: {app}; Flags: ignoreversion; Languages: spanish
-Source: doc/fr/DemarrageRapide.txt; DestDir: {app}; Flags: ignoreversion; Languages: french
-Source: doc/it/GuidaRapida.txt; DestDir: {app}; Flags: ignoreversion; Languages: italian
-Source: doc/no-nb/HurtigStart.txt; DestDir: {app}; Flags: ignoreversion; Languages: norwegian
-Source: doc/sv/Snabbstart.txt; DestDir: {app}; Flags: ignoreversion; Languages: swedish
+Source: ..\..\win32dist-mingw\doc\de\Schnellstart.txt; DestDir: {app}; Flags: ignoreversion; Languages: german
+Source: ..\..\win32dist-mingw\doc\es\InicioRapido.txt; DestDir: {app}; Flags: ignoreversion; Languages: spanish
+Source: ..\..\win32dist-mingw\doc\fr\DemarrageRapide.txt; DestDir: {app}; Flags: ignoreversion; Languages: french
+Source: ..\..\win32dist-mingw\doc\it\GuidaRapida.txt; DestDir: {app}; Flags: ignoreversion; Languages: italian
+Source: ..\..\win32dist-mingw\doc\no-nb\HurtigStart.txt; DestDir: {app}; Flags: ignoreversion; Languages: norwegian
+Source: ..\..\win32dist-mingw\doc\sv\Snabbstart.txt; DestDir: {app}; Flags: ignoreversion; Languages: swedish
 
 ; README and DOCUMENTATION
-Source: README.html; DestDir: {app}; Flags: ignoreversion; Languages: not (czech or german or swedish)
-Source: doc/cz/PrectiMe.txt; DestDir: {app}; Flags: ignoreversion; Languages: czech
-Source: doc/de/LIESMICH.txt; DestDir: {app}; Flags: ignoreversion; Languages: german
-Source: doc/sv/LasMig.txt; DestDir: {app}; Flags: ignoreversion; Languages: swedish
-Source: *Manual*.pdf; DestDir: {app}; Flags: ignoreversion isreadme
+Source: ..\..\win32dist-mingw\doc\cz\PrectiMe.txt; DestDir: {app}; Flags: ignoreversion; Languages: czech
+Source: ..\..\win32dist-mingw\doc\de\LIESMICH.txt; DestDir: {app}; Flags: ignoreversion; Languages: german
+Source: ..\..\win32dist-mingw\doc\sv\LasMig.txt; DestDir: {app}; Flags: ignoreversion; Languages: swedish
 
 ; ScummVM executables and libraries
 ; for 32 bit aka. i686:
-Source: scummvm-i686.exe; DestDir: {app}; DestName: scummvm.exe; Flags: sign ignoreversion; Check: not Is64BitInstallMode
-Source: WinSparkle-i686.dll; DestDir: {app}; DestName: WinSparkle.dll; Flags: replacesameversion; Check: not Is64BitInstallMode
+Source: ..\..\win32dist-mingw\scummvm-i686.exe; DestDir: {app}; DestName: scummvm.exe; Flags: sign ignoreversion; Check: not Is64BitInstallMode
+Source: ..\..\win32dist-mingw\WinSparkle-i686.dll; DestDir: {app}; DestName: WinSparkle.dll; Flags: replacesameversion; Check: not Is64BitInstallMode
 
 ; for 64 bit aka. x86_64
-Source: scummvm-x86_64.exe; DestDir: {app}; DestName: scummvm.exe; Flags: sign ignoreversion; Check: Is64BitInstallMode
-Source: WinSparkle-x86_64.dll; DestDir: {app}; DestName: WinSparkle.dll; Flags: replacesameversion; Check: Is64BitInstallMode
+Source: ..\..\win32dist-mingw\scummvm-x86_64.exe; DestDir: {app}; DestName: scummvm.exe; Flags: sign ignoreversion; Check: Is64BitInstallMode
+Source: ..\..\win32dist-mingw\WinSparkle-x86_64.dll; DestDir: {app}; DestName: WinSparkle.dll; Flags: replacesameversion; Check: Is64BitInstallMode