[Scummvm-git-logs] scummvm master -> e08ac851be03c5369f2dfc31841c15a3319c0752
sev-
noreply at scummvm.org
Fri Mar 17 12:37:42 UTC 2023
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
370cfa730d DEVTOOLS: Add release check for engine-data files
6b078260b2 DISTS: Also, check theme files presence in the dists lists
08b309758d DEVTOOLS: Do not report ADGF_TESTING on itself and better chech for translations.dat
3a8312c072 DISTS: Added missing engine-data files to various lists
e08ac851be DISTS: Fix some grammar in engine-data/README
Commit: 370cfa730da9d115eee6d26f0ae72b678290ac5e
https://github.com/scummvm/scummvm/commit/370cfa730da9d115eee6d26f0ae72b678290ac5e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T13:37:25+01:00
Commit Message:
DEVTOOLS: Add release check for engine-data files
Changed paths:
devtools/release-checks.sh
dists/engine-data/README
diff --git a/devtools/release-checks.sh b/devtools/release-checks.sh
index a686fe345b6..09cf3bbc3b0 100755
--- a/devtools/release-checks.sh
+++ b/devtools/release-checks.sh
@@ -237,6 +237,62 @@ fi
#
#############################################################################
+##########
+# Dat files
+##########
+
+echo_n "Checking engine-data files..."
+
+# Use # as delimiter, %FILE% for the filename
+declare -a distfiles=(
+ "Makefile.common#DIST_FILES_ENGINEDATA\+=%FILE%"
+ "devtools/create_project/xcode.cpp#[ ]+files.push_back\(\"dists/engine-data/%FILE%\"\);"
+ "dists/engine-data/README#%FILE%:"
+ "dists/irix/scummvm.idb#f 0644 root sys usr/ScummVM/share/scummvm/%FILE% %FILE% scummvm.sw.eoe"
+ "dists/scummvm.rc#%FILE%[ ]+FILE[ ]+\"dists/engine-data/%FILE%\""
+ "dists/win32/migration.txt#%FILE%"
+)
+
+IFS=$'\n' # allow arguments with tabs and spaces
+
+absentFiles=0
+
+for f in dists/engine-data/*
+do
+ # Skip directories
+ if [ -d $f ]; then
+ continue
+ fi
+
+ file=`basename $f`
+
+ # Skip README file
+ if [ $file == "README" -o $file == "create-playground3d-data.sh" -o $file == "create-testbed-data.sh" ]; then
+ continue
+ fi
+
+ for d in "${distfiles[@]}"
+ do
+ target=`cut -d '#' -f 1 <<< "$d"`
+ pattern=`cut -d '#' -f 2 <<< "$d"`
+
+ res=`sed "s|%FILE%|$file|g" <<< "$pattern"`
+
+ if [ -z $(grep -E "$res" "$target") ]; then
+ echo "$file is absent in $target"
+ absentFiles=$((absentFiles+1))
+ fi
+ done
+done
+
+if [ "$absentFiles" -ne "0" ]; then
+ echo -e "$absentFiles missing files ${RED}Fix them${NC}"
+
+ failPlus
+else
+ echoOk
+fi
+
###########
# MM engine
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 26dbe5686a2..e6faafe0563 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -21,6 +21,9 @@ This file contains essential game data used by Drascula engine.
encoding.dat:
This file contains character mapping for CJK encodings to unicode.
+freescape.dat:
+This file contains essential game data used byt the Freescape engine.
+
fonts.dat:
This file contains set of free TTF fonts used by Glk, ZVision, Wintermute engines and
our GUI.
Commit: 6b078260b27c05ff3129ab00fc562435e250e0c5
https://github.com/scummvm/scummvm/commit/6b078260b27c05ff3129ab00fc562435e250e0c5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T13:37:25+01:00
Commit Message:
DISTS: Also, check theme files presence in the dists lists
Changed paths:
devtools/release-checks.sh
diff --git a/devtools/release-checks.sh b/devtools/release-checks.sh
index 09cf3bbc3b0..ebcfe252d08 100755
--- a/devtools/release-checks.sh
+++ b/devtools/release-checks.sh
@@ -253,6 +253,7 @@ declare -a distfiles=(
"dists/win32/migration.txt#%FILE%"
)
+OLDIFS="$IFS"
IFS=$'\n' # allow arguments with tabs and spaces
absentFiles=0
@@ -278,13 +279,52 @@ do
res=`sed "s|%FILE%|$file|g" <<< "$pattern"`
- if [ -z $(grep -E "$res" "$target") ]; then
+ if [ -z $(grep -E "$res" "$target" | head -1) ]; then
echo "$file is absent in $target"
absentFiles=$((absentFiles+1))
fi
done
done
+declare -a themefiles=(
+ "Makefile.common#DIST_FILES_THEMES=.*%FILE%"
+ "devtools/create_project/xcode.cpp#[ ]+files.push_back\(\"gui/themes/%FILE%\"\);"
+ "dists/irix/scummvm.idb#f 0644 root sys usr/ScummVM/share/scummvm/%FILE% %FILE% scummvm.sw.eoe"
+ "dists/scummvm.rc#%FILE%[ ]+FILE[ ]+\"gui/themes/%FILE%\""
+ "dists/win32/migration.txt#%FILE%"
+)
+
+for f in gui/themes/*
+do
+ # Skip directories
+ if [ -d $f ]; then
+ continue
+ fi
+
+ file=`basename $f`
+
+ # Skip README file
+ if [ $file == "scummtheme.py" -o $file == "default.inc" ]; then
+ continue
+ fi
+
+ for d in "${themefiles[@]}"
+ do
+ target=`cut -d '#' -f 1 <<< "$d"`
+ pattern=`cut -d '#' -f 2 <<< "$d"`
+
+ res=`sed "s|%FILE%|$file|g" <<< "$pattern"`
+
+ if [ -z $(grep -E "$res" "$target" | head -1) ]; then
+ echo "$file is absent in $target"
+ absentFiles=$((absentFiles+1))
+ fi
+ done
+done
+
+IFS="$OLDIFS"
+
+
if [ "$absentFiles" -ne "0" ]; then
echo -e "$absentFiles missing files ${RED}Fix them${NC}"
Commit: 08b309758d6fe455db31b4e074bd4e43f253208e
https://github.com/scummvm/scummvm/commit/08b309758d6fe455db31b4e074bd4e43f253208e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T13:37:25+01:00
Commit Message:
DEVTOOLS: Do not report ADGF_TESTING on itself and better chech for translations.dat
Changed paths:
devtools/release-checks.sh
diff --git a/devtools/release-checks.sh b/devtools/release-checks.sh
index ebcfe252d08..7b88d9b43dd 100755
--- a/devtools/release-checks.sh
+++ b/devtools/release-checks.sh
@@ -160,7 +160,7 @@ echo_n "Checking ADGF_TESTING..."
# engines/advancedDetector.h: ADGF_TESTING = (1u << 19), ///< Flag to designate not yet officially supported games that are fit for public testing.
# engines/ags/detection_tables.h: DETECTION_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, nullptr, ADGF_TESTING)
-git -P grep ADGF_TESTING | grep -v engines/advancedDetector. | grep -v "engines/ags/detection_tables.h:\tDETECTION_ENTRY.ID," >$TMP
+git -P grep ADGF_TESTING | grep -v engines/advancedDetector. | grep -v "engines/ags/detection_tables.h:\tDETECTION_ENTRY.ID," | grep -v devtools/release-checks.sh >$TMP
num_lines=`cat $TMP | wc -l`
@@ -287,7 +287,7 @@ do
done
declare -a themefiles=(
- "Makefile.common#DIST_FILES_THEMES=.*%FILE%"
+ "Makefile.common#DIST_FILES_THEMES.*%FILE%"
"devtools/create_project/xcode.cpp#[ ]+files.push_back\(\"gui/themes/%FILE%\"\);"
"dists/irix/scummvm.idb#f 0644 root sys usr/ScummVM/share/scummvm/%FILE% %FILE% scummvm.sw.eoe"
"dists/scummvm.rc#%FILE%[ ]+FILE[ ]+\"gui/themes/%FILE%\""
Commit: 3a8312c072a655fc6ecb4daf5eaa7b83711fb9f2
https://github.com/scummvm/scummvm/commit/3a8312c072a655fc6ecb4daf5eaa7b83711fb9f2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T13:37:26+01:00
Commit Message:
DISTS: Added missing engine-data files to various lists
Changed paths:
Makefile.common
devtools/create_project/xcode.cpp
dists/engine-data/README
dists/irix/scummvm.idb
dists/scummvm.rc
dists/win32/migration.txt
diff --git a/Makefile.common b/Makefile.common
index 7cb3e2904d2..833100a684c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -443,6 +443,9 @@ endif
ifdef ENABLE_NEVERHOOD
DIST_FILES_ENGINEDATA+=neverhood.dat
endif
+ifdef ENABLE_PRINCE
+DIST_FILES_ENGINEDATA+=prince_translation.dat
+endif
ifdef ENABLE_QUEEN
DIST_FILES_ENGINEDATA+=queen.tbl
endif
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 50abe827cd8..7662c8f24ca 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -989,6 +989,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
files.push_back("dists/engine-data/mort.dat");
files.push_back("dists/engine-data/nancy.dat");
files.push_back("dists/engine-data/neverhood.dat");
+ files.push_back("dists/engine-data/prince_translation.dat");
files.push_back("dists/engine-data/queen.tbl");
files.push_back("dists/engine-data/sky.cpt");
files.push_back("dists/engine-data/supernova.dat");
diff --git a/dists/engine-data/README b/dists/engine-data/README
index e6faafe0563..fc8a240ea83 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -16,18 +16,24 @@ Some filenames depend on the edition, these are handled by game flags in engine
Those informations were stored in the original executables.
drascula.dat:
-This file contains essential game data used by Drascula engine.
+This file contains essential game data used by the Drascula engine.
encoding.dat:
This file contains character mapping for CJK encodings to unicode.
freescape.dat:
-This file contains essential game data used byt the Freescape engine.
+This file contains essential game data used by the Freescape engine.
fonts.dat:
This file contains set of free TTF fonts used by Glk, ZVision, Wintermute engines and
our GUI.
+grim-patch.lab:
+This file contains set of script patches for Grim Fandango.
+
+hadesch_translations.dat:
+This file contains essential data for Hadesch Challenge game.
+
hugo.dat:
This file contains all the hardcoded logic, strings and fonts used by Hugo
engine. Those information were stored in the original executables.
@@ -44,14 +50,20 @@ macgui.dat:
The file contains set of offsets for recreation of Classic Mac OS GUI, used
by Director, MacVenture and WAGE engines.
-macventure.dat
+macventure.dat:
This file contains additional GUI elements used by MacVenture engine.
+monkey4-patch.m4b:
+This file contains script patches for Escape from Monkey Island game.
+
mort.dat:
File created partially by extracting font data from the French executable. It
also contains the French and German translation, as well as a custom-made
English translation.
+myst3.dat:
+This file contains essential game data used by the Myst3 game.
+
nancy.dat:
File containing various constants, game logic and strings originally embedded
in the games' executables.
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 3aa7b550706..3eb860ca8aa 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -22,15 +22,19 @@ f 0644 root sys usr/ScummVM/share/scummvm/cryomni3d.dat cryomni3d.dat scummvm.sw
f 0644 root sys usr/ScummVM/share/scummvm/drascula.dat drascula.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/encoding.dat encoding.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/fonts.dat fonts.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/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
f 0644 root sys usr/ScummVM/share/scummvm/lure.dat lure.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/macgui.dat macgui.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/macventure.dat macventure.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/monkey4-patch.m4b monkey4-patch.m4b scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/mort.dat mort.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/myst3.dat myst3.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/nancy.dat nancy.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/neverhood.dat neverhood.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/prince_translation.dat prince_translation.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/queen.tbl queen.tbl scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/sky.cpt sky.cpt scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/supernova.dat supernova.dat scummvm.sw.eoe
@@ -43,9 +47,13 @@ f 0644 root sys usr/ScummVM/share/scummvm/freescape.dat freescape.dat scummvm.sw
f 0644 root sys usr/ScummVM/share/scummvm/wintermute.zip wintermute.zip scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/mm.dat mm.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/pred.dic pred.dic scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/residualvm.zip residualvm.zip scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/scummclassic.zip scummclassic.zip scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/scummmodern.zip scummmodern.zip scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/scummremastered.zip scummremastered.zip scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/gui-icons.dat gui-icons.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/shaders.dat shaders.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/translations.dat translations.dat scummvm.sw.eoe
l 0000 root sys usr/bin/scummvm scummvm scummvm.sw.eoe symval(/usr/ScummVM/scummvm)
f 0644 root sys usr/lib/filetype/local/ScummVM.ftr ScummVM.ftr scummvm.sw.eoe exitop('if test -r $rbase/usr/lib/filetype/Makefile ; then chroot $rbase /sbin/sh -c "cd /usr/lib/filetype ; make -u > /dev/null" ; fi')
f 0644 root sys usr/lib/filetype/local/iconlib/ScummVM.fti ScummVM.fti scummvm.sw.eoe exitop('if [ -x $rbase/usr/sbin/iconcatalogedit ]; then chroot $rbase /usr/sbin/iconcatalogedit -add "Category:File Name:/usr/ScummVM/scummvm" -syspage Games; fi') removeop('if [ -x $rbase/usr/sbin/iconcatalogedit ]; then chroot $rbase /usr/sbin/iconcatalogedit -remove "Category:File Name:/usr/ScummVM/scummvm" -syspage Games; fi')
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 70f04a6ccb7..83cf898f0eb 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -88,6 +88,9 @@ nancy.dat FILE "dists/engine-data/nancy.dat"
#if PLUGIN_ENABLED_STATIC(NEVERHOOD)
neverhood.dat FILE "dists/engine-data/neverhood.dat"
#endif
+#if PLUGIN_ENABLED_STATIC(PRINCE)
+prince_translation.dat FILE "dists/engine-data/prince_translation.dat"
+#endif
#if PLUGIN_ENABLED_STATIC(QUEEN)
queen.tbl FILE "dists/engine-data/queen.tbl"
#endif
diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt
index 499a13c3067..e6e6134f496 100644
--- a/dists/win32/migration.txt
+++ b/dists/win32/migration.txt
@@ -11,30 +11,53 @@ COPYING.TINYGL
COPYING.GLAD
COPYING.txt
COPYRIGHT.txt
+access.dat
+achievements.dat
+cryo.dat
+cryomni3d.dat
drascula.dat
+encoding.dat
+fonts.dat
freescape.dat
+grim-patch.lab
+gui-icons.dat
hadesch_translations.dat
hugo.dat
kyra.dat
lure.dat
+macgui.dat
+macventure.dat
m4.dat
migration.bat
migration.txt
+mm.dat
+monkey4-patch.m4b
+mort.dat
+myst3.dat
+nancy.dat
+neverhood.dat
NEWS.txt
pred.dic
+prince_translation.dat
queen.tbl
QUICKSTART.txt
README-SDL.txt
README.txt
+residualvm.zip
scummclassic.zip
scummmodern.zip
scummremastered.zip
-gui-icons.dat
scummvm.exe
SDL2.dll
+shaders.dat
sky.cpt
+supernova.dat
teenagent.dat
+titanic.dat
toon.dat
+tony.dat
translations.dat
+ultima.dat
+wintermute.zip
unins000.dat
unins000.exe
Commit: e08ac851be03c5369f2dfc31841c15a3319c0752
https://github.com/scummvm/scummvm/commit/e08ac851be03c5369f2dfc31841c15a3319c0752
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T13:37:26+01:00
Commit Message:
DISTS: Fix some grammar in engine-data/README
Changed paths:
dists/engine-data/README
diff --git a/dists/engine-data/README b/dists/engine-data/README
index fc8a240ea83..83471e57ced 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -2,7 +2,7 @@ engine-data README
-------------------------------------------------------------------------------
access.dat:
-This file contains game resource data used by Access engine.
+This file contains game resource data used by the Access engine.
achievements.dat:
This file contains Achievements and Statistics IDs and localization from Steam and GOG.
@@ -19,7 +19,7 @@ drascula.dat:
This file contains essential game data used by the Drascula engine.
encoding.dat:
-This file contains character mapping for CJK encodings to unicode.
+This file contains character mapping for CJK encodings to Unicode.
freescape.dat:
This file contains essential game data used by the Freescape engine.
@@ -29,7 +29,7 @@ This file contains set of free TTF fonts used by Glk, ZVision, Wintermute engine
our GUI.
grim-patch.lab:
-This file contains set of script patches for Grim Fandango.
+This file contains set of script patches for Grim Fandango game.
hadesch_translations.dat:
This file contains essential data for Hadesch Challenge game.
@@ -51,7 +51,7 @@ The file contains set of offsets for recreation of Classic Mac OS GUI, used
by Director, MacVenture and WAGE engines.
macventure.dat:
-This file contains additional GUI elements used by MacVenture engine.
+This file contains additional GUI elements used by the MacVenture engine.
monkey4-patch.m4b:
This file contains script patches for Escape from Monkey Island game.
@@ -62,7 +62,7 @@ also contains the French and German translation, as well as a custom-made
English translation.
myst3.dat:
-This file contains essential game data used by the Myst3 game.
+This file contains essential game data used by Myst3 game.
nancy.dat:
File containing various constants, game logic and strings originally embedded
@@ -102,10 +102,10 @@ toon.dat:
This file contains all the strings hardcoded in the original executables.
ultima.dat:
-This file contains scripts and game data used by Ultima engine.
+This file contains scripts and game data used by the Ultima engine.
wintermute.zip:
-This file contains additional graphics resources used by Wintermute engine.
+This file contains additional graphics resources used by the Wintermute engine.
mm.dat:
This file contains all the various strings and data needed for the Might & Magic games.
More information about the Scummvm-git-logs
mailing list