[Scummvm-git-logs] scummvm master -> 37c8fc39b361359fcbdf54c822bed852cb3e8223

Sat Dec 16 20:12:19 UTC 2023

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

Summary:
91c04fa311 DISTS: Rename cloud_connection.zip to helpdialog.zip and add it to the dist lists
37c8fc39b3 BUILD: Make release check script happier


Commit: 91c04fa311e04b92e6c1a477cf4dbd9cf13656ed
    https://github.com/scummvm/scummvm/commit/91c04fa311e04b92e6c1a477cf4dbd9cf13656ed
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-16T21:09:36+01:00

Commit Message:
DISTS: Rename cloud_connection.zip to helpdialog.zip and add it to the dist lists

Changed paths:
  A dists/engine-data/helpdialog.zip
  R dists/engine-data/cloud_connection.zip
    Makefile.common
    devtools/create_project/xcode.cpp
    dists/engine-data/README
    dists/irix/scummvm.idb
    dists/scummvm.rc
    dists/win32/migration.txt
    gui/helpdialog.cpp

diff --git a/Makefile.common b/Makefile.common
index 0ba3541a262..1d03a626855 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -494,6 +494,7 @@ endif
 DIST_FILES_ENGINEDATA+=achievements.dat
 DIST_FILES_ENGINEDATA+=classicmacfonts.dat
 DIST_FILES_ENGINEDATA+=encoding.dat
+DIST_FILES_ENGINEDATA+=helpdialog.zip
 DIST_FILES_ENGINEDATA+=macgui.dat
 DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA))
 
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index be81f53c396..ed581b298ca 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1036,6 +1036,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
 		files.push_back("dists/engine-data/fonts-cjk.dat");
 		files.push_back("dists/engine-data/freescape.dat");
 		files.push_back("dists/engine-data/hadesch_translations.dat");
+		files.push_back("dists/engine-data/helpdialog.zip");
 		files.push_back("dists/engine-data/hugo.dat");
 		files.push_back("dists/engine-data/kyra.dat");
 		files.push_back("dists/engine-data/lure.dat");
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 56366c668cf..62e5a9f79a6 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -45,6 +45,9 @@ This file contains set of script patches for Grim Fandango game.
 hadesch_translations.dat:
 This file contains essential data for Hadesch Challenge game.
 
+helpdialog.zip:
+This file contains images for Help Dialog.
+
 hugo.dat:
 This file contains all the hardcoded logic, strings and fonts used by Hugo
 engine. Those information were stored in the original executables.
diff --git a/dists/engine-data/cloud_connection.zip b/dists/engine-data/helpdialog.zip
similarity index 100%
rename from dists/engine-data/cloud_connection.zip
rename to dists/engine-data/helpdialog.zip
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 31063feea26..7859736903f 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -26,6 +26,7 @@ f 0644 root sys usr/ScummVM/share/scummvm/encoding.dat encoding.dat scummvm.sw.e
 f 0644 root sys usr/ScummVM/share/scummvm/fonts.dat fonts.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/fonts-cjk.dat fonts-cjk.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/grim-patch.lab grim-patch.lab scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/helpdialog.zip helpdialog.zip scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/hugo.dat hugo.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/hadesch_translations.dat hadesch_translations.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/kyra.dat kyra.dat scummvm.sw.eoe
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 504ae321843..8daa4f12558 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -28,6 +28,7 @@ gui-icons.dat          FILE    "gui/themes/gui-icons.dat"
 shaders.dat            FILE    "gui/themes/shaders.dat"
 achievements.dat       FILE    "dists/engine-data/achievements.dat"
 encoding.dat           FILE    "dists/engine-data/encoding.dat"
+helpdialog.zip         FILE    "dists/engine-data/helpdialog.zip"
 macgui.dat             FILE    "dists/engine-data/macgui.dat"
 classicmacfonts.dat    FILE    "dists/engine-data/classicmacfonts.dat"
 
diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt
index c39fcb77734..a897aeb3e8a 100644
--- a/dists/win32/migration.txt
+++ b/dists/win32/migration.txt
@@ -25,6 +25,7 @@ freescape.dat
 grim-patch.lab
 gui-icons.dat
 hadesch_translations.dat
+helpdialog.zip
 hugo.dat
 kyra.dat
 lure.dat
diff --git a/gui/helpdialog.cpp b/gui/helpdialog.cpp
index 19b83105fbb..c6b33e7f110 100644
--- a/gui/helpdialog.cpp
+++ b/gui/helpdialog.cpp
@@ -58,7 +58,7 @@ _s(
 #ifdef USE_CLOUD
 
 _s("Cloud"),
-"cloud_connection.zip",
+"helpdialog.zip",
 _s(
 "## Connecting a cloud service - Quick mode\n"
 "\n"
@@ -82,7 +82,7 @@ _s(
 "\n	"
 "  ![Open the link](open_link.png \"Open the link\"){w=70%}\n"
 "\n"
-"6. In the browser window that opens, select the cloud service to connect. \n"  
+"6. In the browser window that opens, select the cloud service to connect. \n"
 "\n	"
 "  ![Choose the cloud service](cloud_browser.png \"Choose the cloud service\"){w=70%}\n"
 "\n"


Commit: 37c8fc39b361359fcbdf54c822bed852cb3e8223
    https://github.com/scummvm/scummvm/commit/37c8fc39b361359fcbdf54c822bed852cb3e8223
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-16T21:11:32+01:00

Commit Message:
BUILD: Make release check script happier

Changed paths:
    Makefile.common


diff --git a/Makefile.common b/Makefile.common
index 1d03a626855..a1ffdc70e37 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -468,7 +468,8 @@ ifdef ENABLE_TOON
 DIST_FILES_ENGINEDATA+=toon.dat
 endif
 ifdef ENABLE_ULTIMA
-DIST_FILES_ENGINEDATA+=ultima.dat ultima8.dat
+DIST_FILES_ENGINEDATA+=ultima.dat
+DIST_FILES_ENGINEDATA+=ultima8.dat
 endif
 ifdef ENABLE_WINTERMUTE
 DIST_FILES_ENGINEDATA+=wintermute.zip


