Upgrade Libretro frontend and cores to 17.05 release

- Remove Libretro symbols declaration - Print core reports in run scenarios - Run scenario fixups - Fetch shareware Quake in TyrQuake scenario - retro_frontend fixups Ref #74
2017-05-29 22:35:53 -05:00
parent d98c0455ec
commit e38eda2fc0
7 changed files with 90 additions and 78 deletions
--- a/run/cave_story.run
+++ b/run/cave_story.run
@@ -40,6 +40,7 @@ create_boot_directory

 append config {
 <config verbose="yes">
+	<default caps="256"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="IO_MEM"/>
@@ -47,7 +48,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="RM"/>
 		<service name="ROM"/>
 	</parent-provides>
@@ -92,6 +92,7 @@ append_if [have_spec ps2] config {

 append config {
 	<start name="audio_drv">
+		<binary name="} [audio_drv_binary] {"/>
 		<resource name="RAM" quantum="8M"/>
 		<provides> <service name="Audio_out"/> </provides>
 	</start>
@@ -132,16 +133,20 @@ append config {
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
+	<start name="report_rom">
+		<resource name="RAM" quantum="4M"/>
+		<provides> <service name="Report"/> </provides>
+		<config verbose="yes"/>
+	</start>
 	<start name="retro_frontend">
 		<resource name="RAM" quantum="64M"/>
 		<config core="nxengine_libretro.lib.so">
-			<libc stdout="/dev/log" stderr="/dev/log">
-				<vfs>
-					<tar name="doukutsu.tar"/>
-					<dir name="dev"> <log/> </dir>
-					<ram/>
-				</vfs>
-			</libc>
+			<libc stdout="/dev/log" stderr="/dev/log"/>
+			<vfs>
+				<dir name="dev"> <log/> </dir>
+				<tar name="doukutsu.tar"/>
+				<ram/>
+			</vfs>
 		</config>
 		<route>
 			<service name="Framebuffer">
@@ -157,22 +162,23 @@ install_config $config

 if {![file exists bin/doukutsu.tar]} {
 	puts ""
-	puts "Please download an archive of Cave Story content from"
-	puts "   http://www.cavestory.org/download/cave-story.php"
+	puts "Please download a copy of the Cave Story game data from "
+	puts "	http://www.cavestory.org/download/cave-story.php"
 	puts "and re-archive the zip contents to './bin/doukutsu.tar'. Afterwards run this script again."
 	puts ""
 	exit 1
 }

 # generic modules
-set boot_modules {
+append boot_modules {
 	core init ld.lib.so
-	audio_drv
+} [audio_drv_binary] {
 	fb_upscale
 	input_remap
 	libc.lib.so
 	libm.lib.so
 	nxengine_libretro.lib.so
+	report_rom
 	retro_frontend
 	stdcxx.lib.so
 	timer
--- a/run/driar.run
+++ b/run/driar.run
@@ -46,6 +46,7 @@ create_boot_directory

 append config {
 <config verbose="yes">
+	<default caps="128"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="IO_MEM"/>
@@ -53,7 +54,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="RM"/>
 		<service name="ROM"/>
 	</parent-provides>
@@ -98,6 +98,7 @@ append_if [have_spec ps2] config {

 append config {
 	<start name="audio_drv">
+		<binary name="} [audio_drv_binary] {"/>
 		<resource name="RAM" quantum="8M"/>
 		<provides><service name="Audio_out"/></provides>
 	</start>
@@ -138,16 +139,20 @@ append config {
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
+	<start name="report_rom">
+		<resource name="RAM" quantum="4M"/>
+		<provides> <service name="Report"/> </provides>
+		<config verbose="yes"/>
+	</start>
 	<start name="retro_frontend">
 		<resource name="RAM" quantum="64M"/>
 		<config core="fceumm_libretro.lib.so">
 			<game rom="Driar.nes"/>
-			<libc stdout="/log" stderr="/log">
-				<vfs>
-					<log/>
-					<!--<rom name="disksys.rom"/>-->
-				</vfs>
-			</libc>
+			<libc stdout="/log" stderr="/log"/>
+			<vfs>
+				<log/>
+				<!--<rom name="disksys.rom"/>-->
+			</vfs>
 		</config>
 		<route>
 			<service name="Framebuffer">
@@ -173,16 +178,17 @@ if {![file exist bin/Driar.nes]} {
 }

 # generic modules
-set boot_modules {
+append boot_modules {
 	core init ld.lib.so
-	audio_drv
+} [audio_drv_binary] {
 	fb_upscale
+	fceumm_libretro.lib.so
 	input_remap
 	libc.lib.so
 	libm.lib.so
+	report_rom
 	retro_frontend
 	stdcxx.lib.so
-	fceumm_libretro.lib.so
 	timer
 	zlib.lib.so

--- a/run/superbossgaiden.run
+++ b/run/superbossgaiden.run
@@ -47,6 +47,7 @@ create_boot_directory

 append config {
 <config verbose="yes">
+	<default caps="128"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="IO_MEM"/>
@@ -54,7 +55,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="RM"/>
 		<service name="ROM"/>
 	</parent-provides>
@@ -99,6 +99,7 @@ append_if [have_spec ps2] config {

 append config {
 	<start name="audio_drv">
+		<binary name="} [audio_drv_binary] {"/>
 		<resource name="RAM" quantum="8M"/>
 		<provides><service name="Audio_out"/></provides>
 	</start>
@@ -143,9 +144,8 @@ append config {
 		<resource name="RAM" quantum="64M"/>
 		<config core="snes9x_libretro.lib.so">
 			<game rom="superbossgaiden.sfc"/>
-			<libc stdout="/log" stderr="/log">
-				<vfs> <log/> </vfs>
-			</libc>
+			<libc stdout="/log" stderr="/log"/>
+			<vfs> <log/> </vfs>
 		</config>
 		<route>
 			<service name="Framebuffer">
@@ -162,19 +162,24 @@ install_config $config
 #
 # Download and extract a test ROM
 #
-if {![file exist bin/superbossgaiden.zip]} {
-	set zip_url "https://superbossgaiden.superfamicom.org/Super%20Boss%20Gaiden%20(J).zip"
-	catch { exec $wget $zip_url -O bin/superbossgaiden.zip }
-}
 if {![file exist "bin/superbossgaiden.sfc"]} {
-	catch {
-		exec $unzip -o bin/superbossgaiden.zip -d bin
-		exec mv "bin/ROM-Version/Super Boss Gaiden (J) (V1.0).sfc" "bin/superbossgaiden.sfc"
-	}
+	if {![file exist bin/superbossgaiden.zip]} {
+		puts "Downloading Super Boss Gaiden (J).zip..."
+		set zip_url "https://superbossgaiden.superfamicom.org/Super%20Boss%20Gaiden%20(J).zip"
+		catch { exec $wget $zip_url -O bin/superbossgaiden.zip }
+}
+
+	puts "Extracting superbossgaiden.sfc..."
+	exec mkdir bin/tmp
+	exec $unzip -o bin/superbossgaiden.zip -d bin/tmp
+	exec mv "bin/tmp/ROM-Version/Super Boss Gaiden (J) (V1.0).sfc" "bin/superbossgaiden.sfc"
+	exec rm -rf bin/tmp
 }

 # generic modules
-set boot_modules {
+append boot_modules {
+	core init ld.lib.so
+} [audio_drv_binary] {
 	core init ld.lib.so
 	audio_drv
 	fb_upscale
--- a/run/tyrquake.run
+++ b/run/tyrquake.run
@@ -6,6 +6,12 @@ if {[expr [have_include "power_on/qemu"] && !$force_qemu]} {
 	exit
 }

+#
+# Check used commands
+#
+set wget  [check_installed wget]
+set unzip [check_installed unzip]
+
 set build_components {
 	core init
 	app/retro_frontend
@@ -41,6 +47,7 @@ create_boot_directory

 append config {
 <config verbose="yes">
+	<default caps="128"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="IO_MEM"/>
@@ -48,7 +55,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="RM"/>
 		<service name="ROM"/>
 	</parent-provides>
@@ -92,6 +98,7 @@ append_if [have_spec ps2] config {

 append config {
 	<start name="audio_drv">
+		<binary name="} [audio_drv_binary] {"/>
 		<resource name="RAM" quantum="8M"/>
 		<provides> <service name="Audio_out"/> </provides>
 	</start>
@@ -164,7 +171,26 @@ append config {
 install_config $config

 #
-# Core variables ROM
+# Download and extract shareware Quake
+#
+if {![file exist "bin/quake.tar"]} {
+	if {![file exist bin/quake_sw.zip]} {
+		puts "Downloading shareware Quake..."
+		set zip_url "https://archive.org/download/quakeshareware/QUAKE_SW.zip"
+		catch { exec $wget $zip_url -O bin/quake_sw.zip }
+	}
+
+	puts "Extracting Quake data..."
+	exec mkdir -p bin/tmp/quake
+	exec $unzip -o bin/quake_sw.zip -d bin/tmp
+	exec mv "bin/tmp/QUAKE_SW/ID1/CONFIG.CFG" "bin/tmp/quake/config.cfg"
+	exec mv "bin/tmp/QUAKE_SW/ID1/PAK0.PAK" "bin/tmp/quake/pak0.pak"
+	exec tar cf bin/quake.tar -C bin/tmp/quake .
+	exec rm -rf bin/tmp
+}
+
+#
+# This core requires that some variables be set by the frontend
 #
 set variables_fd [open "bin/variables" w]
 puts $variables_fd {
@@ -176,22 +202,10 @@ puts $variables_fd {
 }
 close $variables_fd

-
-if {![file exists bin/quake.tar]} {
-	puts ""
-	puts "Content archive not present, please place a tarball containing the"
-	puts "files 'pak0.pak' and 'config.cfg' at 'bin/quake.tar'."
-	puts ""
-	puts "These can be found in the shareware version of Quake available at:"
-	puts "    https://archive.org/details/quakeshareware"
-	puts ""
-	exit 1
-}
-
 # generic modules
-set boot_modules {
+append boot_modules {
 	core init ld.lib.so
-	audio_drv
+	} [audio_drv_binary] {
 	fb_upscale
 	input_remap
 	libc.lib.so