[Scummvm-git-logs] scummvm branch-2-3 -> 1e5c529c760ef392311f96f55ba9dd5b6017a157
ccawley2011
ccawley2011 at gmail.com
Thu Sep 30 12:22:56 UTC 2021
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:
1e5c529c76 RISCOS: Update packaging to accomodate split builds
Commit: 1e5c529c760ef392311f96f55ba9dd5b6017a157
https://github.com/scummvm/scummvm/commit/1e5c529c760ef392311f96f55ba9dd5b6017a157
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-09-30T13:22:37+01:00
Commit Message:
RISCOS: Update packaging to accomodate split builds
Changed paths:
A dists/riscos/!ScummVM2/!Sprites,ff9
A dists/riscos/!ScummVM2/!Sprites11,ff9
.gitignore
backends/platform/sdl/riscos/riscos.mk
dists/riscos/!Help,feb
dists/riscos/!Run,feb
diff --git a/.gitignore b/.gitignore
index 0f87de6d54..a8474a65ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ lib*.a
/MT32_PCM.ROM
/ScummVM.app
/scummvm.docktileplugin
-/\!ScummVM
+/\!ScummVM*
/*,e1f
/scummvm-ps3.pkg
/*.ipk
diff --git a/backends/platform/sdl/riscos/riscos.mk b/backends/platform/sdl/riscos/riscos.mk
index 85e71f1fbb..281abbaa7d 100644
--- a/backends/platform/sdl/riscos/riscos.mk
+++ b/backends/platform/sdl/riscos/riscos.mk
@@ -4,7 +4,8 @@ else
ENCODING=ISO-8859-1//IGNORE//TRANSLIT
endif
-APP_NAME=!ScummVM
+BASE_APP_NAME ?= !ScummVM
+APP_NAME ?= $(BASE_APP_NAME)
DIST_FILES_DOCS_plaintext := $(filter-out $(DIST_FILES_MANUAL),$(DIST_FILES_DOCS))
@@ -12,36 +13,46 @@ DIST_FILES_DOCS_plaintext := $(filter-out $(DIST_FILES_MANUAL),$(DIST_FILES_DOCS
riscosdist: all
mkdir -p $(APP_NAME)
elf2aif $(EXECUTABLE) $(APP_NAME)/scummvm,ff8
- cp ${srcdir}/dists/riscos/!Boot,feb $(APP_NAME)/!Boot,feb
+ cp ${srcdir}/dists/riscos/!Help,feb $(APP_NAME)/!Help,feb
cp ${srcdir}/dists/riscos/!Run,feb $(APP_NAME)/!Run,feb
+ifeq ($(APP_NAME),$(BASE_APP_NAME))
+ cp ${srcdir}/dists/riscos/!Boot,feb $(APP_NAME)/!Boot,feb
cp ${srcdir}/dists/riscos/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9
cp ${srcdir}/dists/riscos/!Sprites11,ff9 $(APP_NAME)/!Sprites11,ff9
+else
+ echo 'IconSprites <Obey$$Dir>.!Sprites' > $(APP_NAME)/!Boot,feb
+ cp ${srcdir}/dists/riscos/$(APP_NAME)/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9
+ cp ${srcdir}/dists/riscos/$(APP_NAME)/!Sprites11,ff9 $(APP_NAME)/!Sprites11,ff9
+endif
sed -i -e "s/|WimpSlot/WimpSlot -min `du -k $(APP_NAME)/scummvm,ff8 | cut -f1`K/g" $(APP_NAME)/!Run,feb
- mkdir -p $(APP_NAME)/data
- cp $(DIST_FILES_THEMES) $(APP_NAME)/data/
+ mkdir -p $(BASE_APP_NAME)/data
+ cp $(DIST_FILES_THEMES) $(BASE_APP_NAME)/data/
ifdef DIST_FILES_NETWORKING
- cp $(DIST_FILES_NETWORKING) $(APP_NAME)/data/
+ cp $(DIST_FILES_NETWORKING) $(BASE_APP_NAME)/data/
endif
ifdef DIST_FILES_ENGINEDATA
- cp $(DIST_FILES_ENGINEDATA) $(APP_NAME)/data/
+ cp $(DIST_FILES_ENGINEDATA) $(BASE_APP_NAME)/data/
endif
ifdef DIST_FILES_VKEYBD
- cp $(DIST_FILES_VKEYBD) $(APP_NAME)/data/
+ cp $(DIST_FILES_VKEYBD) $(BASE_APP_NAME)/data/
endif
ifdef DYNAMIC_MODULES
mkdir -p $(APP_NAME)/plugins
cp $(PLUGINS) $(APP_NAME)/plugins/
endif
+ifeq ($(APP_NAME),$(BASE_APP_NAME))
mkdir -p $(APP_NAME)/docs
- cp ${srcdir}/dists/riscos/!Help,feb $(APP_NAME)/!Help,feb
ifdef TOKENIZE
$(TOKENIZE) ${srcdir}/dists/riscos/FindHelp,fd1 -out $(APP_NAME)/FindHelp,ffb
endif
ifdef DIST_FILES_MANUAL
+ifneq ("$(wildcard $(DIST_FILES_MANUAL))","")
cp $(DIST_FILES_MANUAL) $(APP_NAME)/docs/ScummVM,adf
+endif
endif
@$(foreach file, $(DIST_FILES_DOCS_plaintext) $(srcdir)/doc/QuickStart, echo ' ' ICONV ' ' $(APP_NAME)/docs/$(notdir $(file)),fff;iconv --to-code=$(ENCODING) $(file) > $(APP_NAME)/docs/$(notdir $(file)),fff;)
@$(foreach lang, $(DIST_FILES_DOCS_languages), mkdir -p $(APP_NAME)/docs/$(lang); $(foreach file, $(DIST_FILES_DOCS_$(lang)), echo ' ' ICONV ' ' $(APP_NAME)/docs/$(lang)/$(notdir $(file)),fff;iconv --from-code=UTF-8 --to-code=$(ENCODING) $(file) > $(APP_NAME)/docs/$(lang)/$(notdir $(file)),fff;))
+endif
clean: riscosclean
diff --git a/dists/riscos/!Help,feb b/dists/riscos/!Help,feb
index f14c651c89..c5b4ce183e 100644
--- a/dists/riscos/!Help,feb
+++ b/dists/riscos/!Help,feb
@@ -1,3 +1,6 @@
Run <Obey$Dir>.!Boot
+
+If "<ScummVM$Dir>"="" Then Error ScummVM has not been seen by the filer.
+
Filer_Opendir <ScummVM$Dir>.docs
IfThere <ScummVM$Dir>.FindHelp Then Run <ScummVM$Dir>.FindHelp
diff --git a/dists/riscos/!Run,feb b/dists/riscos/!Run,feb
index ed3d4d15b6..ffe66f19c8 100644
--- a/dists/riscos/!Run,feb
+++ b/dists/riscos/!Run,feb
@@ -1,5 +1,7 @@
Run <Obey$Dir>.!Boot
+If "<ScummVM$Dir>"="" Then Error ScummVM has not been seen by the filer.
+
Set Alias$RMLoadIfThere IfThere %%0 Then RMLoad %%*0
RMEnsure SharedUnixLibrary 1.14 RMLoadIfThere System:Modules.SharedULib
@@ -12,8 +14,8 @@ Unset Alias$RMLoadIfThere
| If running from the desktop, redirect stdout and stderr to a file.
| This shouldn't happen when running from the command line, so that commands like "<ScummVM$Dir> --help" still work as expected.
-Set Alias$Run_ScummVM Run <ScummVM$Dir>.scummvm %%*0 ><Choices$Write>.ScummVM.stdout 2><Choices$Write>.ScummVM.stderr
-If "<Wimp$State>"="commands" Then Set Alias$Run_ScummVM Run <ScummVM$Dir>.scummvm %%*0
+Set Alias$Run_ScummVM Run <Obey$Dir>.scummvm %%*0 ><Choices$Write>.ScummVM.stdout 2><Choices$Write>.ScummVM.stderr
+If "<Wimp$State>"="commands" Then Set Alias$Run_ScummVM Run <Obey$Dir>.scummvm %%*0
CDir <Choices$Write>.ScummVM
|WimpSlot
diff --git a/dists/riscos/!ScummVM2/!Sprites,ff9 b/dists/riscos/!ScummVM2/!Sprites,ff9
new file mode 100644
index 0000000000..83559bdbb9
Binary files /dev/null and b/dists/riscos/!ScummVM2/!Sprites,ff9 differ
diff --git a/dists/riscos/!ScummVM2/!Sprites11,ff9 b/dists/riscos/!ScummVM2/!Sprites11,ff9
new file mode 100644
index 0000000000..b55e6b7d60
Binary files /dev/null and b/dists/riscos/!ScummVM2/!Sprites11,ff9 differ
More information about the Scummvm-git-logs
mailing list