[Scummvm-git-logs] scummvm master -> 9a302e1fc11121001b4e621dfa09ea09e4871d70

[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:
3292bf500c DISTS: WIN32: Get file information from original source directory
9a302e1fc1 DISTS: WIN32: Delete more obsolete files in Inno Setup


Commit: 3292bf500ccbaee14c7ed922201fed89e3a5cf75
    https://github.com/scummvm/scummvm/commit/3292bf500ccbaee14c7ed922201fed89e3a5cf75
Author: Lothar Serra Mari (mail at serra.me)
Date: 2025-05-25T07:31:43+02:00

Commit Message:
DISTS: WIN32: Get file information from original source directory

Changed paths:
    dists/win32/ScummVM.iss


diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss
index 0d128490cdb..21034c60f6a 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -3,9 +3,9 @@
 ; version in one installer, we just use the 32 bit version here
 ; for simplicity.
 #define AppName "ScummVM"
-#define FileVersion=GetFileVersion('scummvm-i686.exe')
-#define ProductVersion=GetStringFileInfo('scummvm-i686.exe', 'ProductVersion')
-#define Copyright=GetStringFileInfo('scummvm-i686.exe', 'LegalCopyright')
+#define FileVersion=GetFileVersion('..\..\win32dist-mingw\scummvm-i686.exe')
+#define ProductVersion=GetStringFileInfo('..\..\win32dist-mingw\scummvm-i686.exe', 'ProductVersion')
+#define Copyright=GetStringFileInfo('..\..\win32dist-mingw\scummvm-i686.exe', 'LegalCopyright')
 
 [Setup]
 AppCopyright={#Copyright}


Commit: 9a302e1fc11121001b4e621dfa09ea09e4871d70
    https://github.com/scummvm/scummvm/commit/9a302e1fc11121001b4e621dfa09ea09e4871d70
Author: Lothar Serra Mari (mail at serra.me)
Date: 2025-05-25T07:43:29+02:00

Commit Message:
DISTS: WIN32: Delete more obsolete files in Inno Setup

This is required due to switching to our official MXE toolchain,
comapared to the old one that served us since 2019.

This is a one-term mitigation, we can clean this up for the next release
or if we are sure that enough people are on this version.

In theory, I'd clean the entire installation directory, but I really don't
like the idea of unconditionally touching user's files, so there's this
ugly hack.

Changed paths:
    dists/win32/ScummVM.iss


diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss
index 21034c60f6a..8221cf8313a 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -94,7 +94,11 @@ 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
+Type: files; Name: {app}\LICENSES\*
+Type: files; Name: {app}\*.html
+Type: files; Name: {app}\*.txt
+Type: files; Name: {app}\*.pdf
+Type: dirifempty; Name: {app}\LICENSES
 
 [UninstallDelete]
 Type: files; Name: {app}\ISTool.url