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

digitall dgturner at iee.org
Fri Jun 15 02:15:55 CEST 2018


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

Summary:
ae8b5dc086 RISCOS: Add a script to open the README file based on the system territory


Commit: ae8b5dc086254e5b4cad4f2115a0165cf31a4c51
    https://github.com/scummvm/scummvm/commit/ae8b5dc086254e5b4cad4f2115a0165cf31a4c51
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-06-15T01:15:52+01:00

Commit Message:
RISCOS: Add a script to open the README file based on the system territory

Changed paths:
  A dists/riscos/FindHelp,fd1
    backends/platform/sdl/riscos/riscos.mk
    configure
    dists/riscos/!Help,feb


diff --git a/backends/platform/sdl/riscos/riscos.mk b/backends/platform/sdl/riscos/riscos.mk
index 0a3061f..af59958 100644
--- a/backends/platform/sdl/riscos/riscos.mk
+++ b/backends/platform/sdl/riscos/riscos.mk
@@ -21,5 +21,8 @@ ifdef DYNAMIC_MODULES
 endif
 	mkdir -p !ScummVM/docs
 	cp ${srcdir}/dists/riscos/!Help,feb !ScummVM/!Help,feb
+ifdef TOKENIZE
+	$(TOKENIZE) dists/riscos/FindHelp,fd1 -out !ScummVM/FindHelp,ffb
+endif
 	cp $(DIST_FILES_DOCS) !ScummVM/docs
 	cp -r ${srcdir}/doc/* !ScummVM/docs
diff --git a/configure b/configure
index 7898a44..418c945 100755
--- a/configure
+++ b/configure
@@ -1801,6 +1801,12 @@ riscos)
 		echo "Please set GCCSDK_INSTALL_ENV in your environment. export GCCSDK_INSTALL_ENV=<path to GCCSDK_INSTALL_ENV>"
 		exit 1
 	fi
+
+	if test -e "$GCCSDK_INSTALL_ENV/bin/tokenize"; then
+		add_line_to_config_mk "TOKENIZE := $GCCSDK_INSTALL_ENV/bin/tokenize"
+	elif `which tokenize >/dev/null 2>&1`; then
+		add_line_to_config_mk "TOKENIZE := tokenize"
+	fi
 	;;
 tizen)
 	if test -z "$TIZEN_ROOTSTRAP"; then
diff --git a/dists/riscos/!Help,feb b/dists/riscos/!Help,feb
index fca98bc..f14c651 100644
--- a/dists/riscos/!Help,feb
+++ b/dists/riscos/!Help,feb
@@ -1 +1,3 @@
-Filer_Opendir <Obey$Dir>.docs
+Run <Obey$Dir>.!Boot
+Filer_Opendir <ScummVM$Dir>.docs
+IfThere <ScummVM$Dir>.FindHelp Then Run <ScummVM$Dir>.FindHelp
diff --git a/dists/riscos/FindHelp,fd1 b/dists/riscos/FindHelp,fd1
new file mode 100644
index 0000000..289936b
--- /dev/null
+++ b/dists/riscos/FindHelp,fd1
@@ -0,0 +1,42 @@
+ON ERROR PROCerror
+file$=""
+
+SYS "Territory_Number" TO current_territory%
+REPEAT
+   READ territory%, prefix$, quickstart$, readme$
+   IF territory%=current_territory% OR territory%=-1 THEN
+      IF quickstart$<>"" THEN
+         SYS "OS_File",20,"<ScummVM$Dir>.docs."+prefix$+quickstart$ TO qtype%
+         IF qtype%<>0 THEN
+            file$="<ScummVM$Dir>.docs."+prefix$+quickstart$
+         ENDIF
+      ENDIF
+      IF readme$<>"" THEN
+         SYS "OS_File",20,"<ScummVM$Dir>.docs."+prefix$+readme$ TO rtype%
+         IF rtype%<>0 THEN
+            file$="<ScummVM$Dir>.docs."+prefix$+readme$
+         ENDIF
+      ENDIF
+   ENDIF
+UNTIL territory%=-1 OR file$<>""
+
+IF file$<>"" THEN
+   OSCLI "Filer_Run "+file$
+ENDIF
+END
+
+DEF PROCerror
+   ON ERROR OFF
+   ERROR ERR, REPORT$+" at line "+STR$(ERL)
+ENDPROC
+
+REM Reference: https://www.riscosopen.org/wiki/documentation/show/Territory%20Numbers
+DATA 4,   "it.",    "GuidaRapida",     ""
+DATA 5,   "es.",    "InicioRapido",    ""
+DATA 6,   "fr.",    "DemarrageRapide", ""
+DATA 7,   "de.",    "Schnellstart",    "LIESMICH"
+DATA 11,  "se.",    "Snabbstart",      "LasMig"
+DATA 14,  "da.",    "HurtigStart",     ""
+DATA 15,  "no-nb.", "HurtigStart",     ""
+DATA 134, "cz.",    "",                "PrectiMe"
+DATA -1,  "",       "QuickStart",      "README"





More information about the Scummvm-git-logs mailing list