Merge Softload facility for RiscPC, Iyonix, & Titanium machines

After the previous change, the facility to softload a ROM at boot is
effectively the same on all these machines. This change generates it from a
single Generic set of source files, rather than the sets for each of 5 build
processes previously.

Some insignificant inconsistencies have been eliminated, and 14 files merged
into 7.

The Prompt BASIC program is now BasicTxt, and Crunched for release.

Testing:
All 5 builds have been generated by simulating the AutoBuilder, and the
resulting zips compared before and after these changes with no significant
differences found.

Version 1.08. Tagged as 'ABRelease-1_08'

Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/Loader,feb → Resources/Generic/soft/Loader,feb

@@ -15,4 +15,7 @@ RMEnsure SharedCLibrary 5.46 RMLoad System:Modules.CLib
 RMEnsure SharedCLibrary 5.46 Error The softloader requires SharedCLibrary 5.46 or later
 
 | Softload the new ROM and reboot into it...
-Run <SoftLoad$Dir>.SoftLoad -v <SoftLoad$Dir>.riscos
+| The -m 12M parm tries to ensure sufficient memory.
\ No newline at end of file
+| The .NONE. unloads any softloaded ROM if insufficient memory.
+| A -v parm can be added to give verbose output.
+Run <SoftLoad$Dir>.SoftLoad  -m 12M  <SoftLoad$Dir>.riscos .NONE.

Resources/Generic/soft/Prompt,fd1

+REM > ABRelease.Resources.Generic.soft.Prompt
+
+REM Copyright 2010 RISC OS Open Ltd
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM     http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM
+REM RISC OS ROM softload utility - ask user if they want to softload
+
+REM Added (simple) support for Germany,Switzerland; DT 2010
+
+SYS"OS_Byte",70,127 TO ,c%
+
+IF c%=7 OR c%=35 THEN
+PRINT "Mchten Sie das neue BS starten (j/N)? "
+
+*Fx 15 1
+FOR sec% = 10 TO 0 STEP -1
+  PRINT CHR$(13)"(Starten wird in ";sec%" Sekunden fortgesetzt) ";
+  key$ = INKEY$(100)
+  CASE key$ OF
+    WHEN ""
+      REM do nothing
+    WHEN "J", "j"
+      PRINT''"OK - Softloading..."
+      *Run <SoftLoad$Dir>.Loader
+      QUIT
+    OTHERWISE
+      sec%=0
+  ENDCASE
+NEXT
+PRINT''"Kein Softload"
+
+ELSE
+
+PRINT "Would you like to softload the new OS (y/N)? "
+
+*Fx 15 1
+FOR sec% = 10 TO 0 STEP -1
+  PRINT CHR$(13)"(booting will continue in ";sec%" seconds) ";
+  key$ = INKEY$(100)
+  CASE key$ OF
+    WHEN ""
+      REM do nothing
+    WHEN "Y", "y"
+      PRINT''"Yes - softloading..."
+      *Run <SoftLoad$Dir>.Loader
+      QUIT
+    OTHERWISE
+      sec%=0
+   ENDCASE
+NEXT
+PRINT''"No softload"
+ENDIF
+key$ = INKEY$(100)
+QUIT

Resources/IOMDHAL/clean,feb

@@ -15,13 +15,12 @@
 | Set up and/or override some system variables
 Set ab_local$zip       rom-iomd/zip
 Set ab_local$soft      soft-iomd/zip
-Set ab_soft$dir        <ab_res$dir>.soft.!Boot.Resources.SoftLoad
+Set ab_soft$dir        <ab_res$dir>.zips.!Boot.Resources.SoftLoad
 Set ab_local$translate translate-iomd/zip
 
 | Remove any old crud from our resources directory
-x Wipe <ab_res$dir>.zip ~cfr~v
-Remove <ab_res$dir>.soft.LICENSE
-Remove <ab_soft$dir>.riscos
+x Wipe <ab_res$dir>.zip       ~cfr~v
+x Wipe <ab_res$dir>.zips      ~cfr~v
 x Wipe <ab_res$dir>.translate ~cfr~v
 Remove <ab_res$dir>.<ab_local$zip>
 Remove <ab_res$dir>.<ab_local$soft>

Resources/IOMDHAL/release_autobuild,feb

@@ -18,8 +18,10 @@ IfThere <Build$Dir>.Images.<Build$ImageName> Then Else Obey
 | Run our clean script
 Run <ab_res$dir>.clean
 
-| Prepare the ROM build zipfile
+| Prepare the ROM build zip directory
 CDir <ab_res$dir>.zip
+
+| Populate the ROM Build zip directory
 Copy ab_res:LICENSE                       <ab_res$dir>.zip.LICENSE ~cf~r~v
 Copy ab_res:ReadMe/txt                    <ab_res$dir>.zip.ReadMe/txt ~cf~r~v
 Copy <Build$Dir>.Images.<Build$ImageName> <ab_res$dir>.zip.riscos ~cf~r~v
@@ -30,15 +32,24 @@ Do zip -9qr ^.<ab_local$zip> *
 SetType <ab_res$dir>.<ab_local$zip> &A91
 Back
 
-| Prepare the softload zipfile
-CDir <ab_res$dir>.soft
-Copy ab_res:LICENSE <ab_res$dir>.soft.LICENSE ~cf~r~v
-Copy ab_res:SoftLoad <ab_soft$dir>.SoftLoad ~cf~v
-Copy ab_res:Prompt <ab_soft$dir>.Prompt ~cf~v
+| Prepare the softload zip directory
+Do Mkdir -p <ab_soft$dir>
+
+| Populate the softload zip directory
+Copy ab_res:LICENSE <ab_res$dir>.zips.LICENSE ~cf~r~v
+Copy ab_res:soft.ReadMe/txt <ab_res$dir>.zips.ReadMe/txt ~cf~r~v
+Copy ab_res:soft.!Run       <ab_soft$dir>.* ~cf~v
+Copy ab_res:soft.Loader     <ab_soft$dir>.* ~cf~v
+Copy ab_res:soft.SoftLoad   <ab_soft$dir>.* ~cf~v
+Run BasCrunch -1 ab_res:soft.Prompt <ab_soft$dir>.Prompt
 Copy <ab_res$dir>.zip.riscos <ab_soft$dir>.riscos ~cf~r~v
 
+| Copy pre-EDID specific softload support
+Do Mkdir -p <ab_res$dir>.zips.!Boot.Choices.Boot.PreDesk
+Copy ab_res:Configure <ab_res$dir>.zips.!Boot.Choices.Boot.PreDesk.Configure ~cfr~v
+
 | Create a zip archive with the required files in it
-Dir <ab_res$dir>.soft
+Dir <ab_res$dir>.zips
 Do zip -9qr ^.<ab_local$soft> *
 SetType <ab_res$dir>.<ab_local$soft> &A91
 Back

Resources/IOMDHAL/soft/!Boot/Resources/SoftLoad/Loader,feb

-| >!Boot.Resources.SoftLoad.Loader
-| Copyright  2010, RISC OS Open
-| All rights reserved.
-|
-| RISC OS ROM softload utility
-
-| Ensure that !System is available...
-SetEval SoftLoad$Sys 0
-If "<System$Dir>" = "" Then SetEval SoftLoad$Sys 1
-If SoftLoad$Sys Then Set System$Dir Boot:Resources.!System
-If SoftLoad$Sys Then Run <System$Dir>.SysPaths
-
-| Load the SharedCLibrary if we need to...
-RMEnsure SharedCLibrary 5.46 RMLoad System:Modules.CLib
-RMEnsure SharedCLibrary 5.46 Error The softloader requires SharedCLibrary 5.46 or later
-
-| Softload the new ROM and reboot into it...
-Run <Softload$Dir>.SoftLoad -v -m 12M <Softload$Dir>.riscos .NONE.
\ No newline at end of file

Resources/IOMDHALDev/clean,feb

@@ -19,5 +19,3 @@ Set ab_soft$dir  <ab_res$dir>.zip.soft.!Boot.Resources.SoftLoad
 | Remove any old crud from our resources directory
 x Wipe <ab_res$dir>.zip ~cfr~v
 Remove <ab_res$dir>.<ab_local$zip>
-Remove <ab_res$dir>.soft.LICENSE
-Remove <ab_soft$dir>.riscos

Resources/IOMDHALDev/release_autobuild,feb

@@ -19,7 +19,7 @@ IfThere <Build$Dir>.Images.<Build$ImageName> Then Else Obey
 Run <ab_res$dir>.clean
 
 | Create an empty directory to hold the files that will be zipped up
-CDir <ab_res$dir>.zip
+Do Mkdir -p <ab_soft$dir>
 
 | Copy the Apache licence file into the zip directory
 Copy ab_res:LICENSE <ab_res$dir>.zip.LICENSE ~cf~r~v
@@ -27,16 +27,16 @@ Copy ab_res:LICENSE <ab_res$dir>.zip.LICENSE ~cf~r~v
 | Copy the ReadMe for this build into the zip directory
 Copy ab_res:ReadMe/txt <ab_res$dir>.zip.ReadMe/txt ~cf~r~v
 
-| Copy the ROM image into the softload directory
-Copy ab_res:soft <ab_res$dir>.zip.soft ~cfr~v
-Copy ab_res:SoftLoad <ab_soft$dir>.SoftLoad ~cf~v
-Copy ab_res:Prompt <ab_soft$dir>.Prompt ~cf~v
+| Populate the softload zip directory
+Copy ab_res:soft.ReadMe/txt <ab_res$dir>.zip.soft.ReadMe/txt ~cf~r~v
+Copy ab_res:soft.!Run     <ab_soft$dir>.* ~cf~v
+Copy ab_res:soft.Loader   <ab_soft$dir>.* ~cf~v
+Copy ab_res:soft.SoftLoad <ab_soft$dir>.* ~cf~v
+Run BasCrunch -1 ab_res:soft.Prompt <ab_soft$dir>.Prompt
 Copy <Build$Dir>.Images.<Build$ImageName> <ab_soft$dir>.riscos ~cf~r~v
 
 | Copy pre-EDID specific softload support
-CDir <ab_res$dir>.zip.soft.!Boot.Choices
-CDir <ab_res$dir>.zip.soft.!Boot.Choices.Boot
-CDir <ab_res$dir>.zip.soft.!Boot.Choices.Boot.PreDesk
+Do Mkdir -p <ab_res$dir>.zip.soft.!Boot.Choices.Boot.PreDesk
 Copy ab_res:Configure <ab_res$dir>.zip.soft.!Boot.Choices.Boot.PreDesk.Configure ~cfr~v
 
 | Set the zip directory as the current directory

Resources/IOMDHALDev/soft/!Boot/Resources/SoftLoad/Loader,feb

-| >!Boot.Resources.SoftLoad.Loader
-| Copyright  2010, RISC OS Open
-| All rights reserved.
-|
-| RISC OS ROM softload utility
-
-| Ensure that !System is available...
-SetEval SoftLoad$Sys 0
-If "<System$Dir>" = "" Then SetEval SoftLoad$Sys 1
-If SoftLoad$Sys Then Set System$Dir Boot:Resources.!System
-If SoftLoad$Sys Then Run <System$Dir>.SysPaths
-
-| Load the SharedCLibrary if we need to...
-RMEnsure SharedCLibrary 5.46 RMLoad System:Modules.CLib
-RMEnsure SharedCLibrary 5.46 Error The softloader requires SharedCLibrary 5.46 or later
-
-| Softload the new ROM and reboot into it...
-Run <Softload$Dir>.SoftLoad -v -m 12M <Softload$Dir>.riscos .NONE.
\ No newline at end of file

Resources/TitaniumDev/clean,feb

@@ -19,4 +19,3 @@ Set ab_soft$dir  <ab_res$dir>.zip.soft.!Boot.Resources.SoftLoad
 | Remove any old crud from our resources directory
 x Wipe <ab_res$dir>.zip ~cfr~v
 Remove <ab_res$dir>.<ab_local$zip>
-Remove <ab_res$dir>.soft.LICENSE

Resources/TitaniumDev/release_autobuild,feb

@@ -19,7 +19,7 @@ IfThere <Build$Dir>.Images.<Build$ImageName> Then Else Obey
 Run <ab_res$dir>.clean
 
 | Create an empty directory to hold the files that will be zipped up
-CDir <ab_res$dir>.zip
+Do Mkdir -p <ab_soft$dir>
 
 | Copy the Apache licence file into the zip directory
 Copy ab_res:LICENSE <ab_res$dir>.zip.LICENSE ~cf~r~v
@@ -30,16 +30,16 @@ Copy ab_res:ReadMe/txt <ab_res$dir>.zip.ReadMe/txt ~cf~r~v
 | Copy the boot ROM programmer tool into the zip directory
 Copy ab_res:FlashQSPI <ab_res$dir>.zip.FlashQSPI ~cf~r~v
 
-| Create & populate the softload zip directory
-Copy ab_res:soft <ab_res$dir>.zip.soft ~cfr~v
-Copy ab_res:SoftLoad <ab_soft$dir>.SoftLoad ~cf~v
-Copy ab_res:Prompt <ab_soft$dir>.Prompt ~cf~v
+| Populate the softload zip directory
+Copy ab_res:soft.ReadMe/txt <ab_res$dir>.zip.soft.ReadMe/txt ~cf~r~v
+Copy ab_res:soft.!Run     <ab_soft$dir>.* ~cf~v
+Copy ab_res:soft.Loader   <ab_soft$dir>.* ~cf~v
+Copy ab_res:soft.SoftLoad <ab_soft$dir>.* ~cf~v
+Run BasCrunch -1 ab_res:soft.Prompt <ab_soft$dir>.Prompt
 Copy <Build$Dir>.Images.<Build$ImageName> <ab_soft$dir>.riscos ~cf~r~v
 
 | Copy pre-EDID specific softload support
-CDir <ab_res$dir>.zip.soft.!Boot.Choices
-CDir <ab_res$dir>.zip.soft.!Boot.Choices.Boot
-CDir <ab_res$dir>.zip.soft.!Boot.Choices.Boot.PreDesk
+Do Mkdir -p <ab_res$dir>.zip.soft.!Boot.Choices.Boot.PreDesk
 Copy ab_res:Configure <ab_res$dir>.zip.soft.!Boot.Choices.Boot.PreDesk.Configure ~cfr~v
 
 | Set the zip directory as the current directory

Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/!Run,feb

-| >!Boot.Resources.SoftLoad.!Run
-| Copyright  2010, RISC OS Open
-| All rights reserved.
-|
-| RISC OS ROM softload utility
-
-| Set up environment, start the process...
-Set SoftLoad$Dir <Obey$Dir>
-
-| Check OS version and run user prompt...
-RMEnsure UtilityModule 5.29 Run <SoftLoad$Dir>.Prompt
\ No newline at end of file

Resources/TitaniumDev/soft/ReadMe.txt

 Softloader
 ==========
 
-This is a ROM softloader for the Titanium pc.
+This is the ROM softloader for the Titanium computer. 
 
 It includes the softload tool and respective RISC OS ROM image which can be 
 installed into your boot sequence as follows:
@@ -15,8 +15,8 @@ installed into your boot sequence as follows:
 * Ensure you have an up to date !System containing SharedCLibrary 5.46 or
   later. 
 
-Installing the Softloader
--------------------------
+Installing Softload
+-------------------
 
 * Run the configure application by left double-clicking '!Boot'
 

Resources/Tungsten/clean,feb

@@ -15,13 +15,12 @@
 | Set up and/or override some system variables
 Set ab_local$zip       rom-iyonix/zip
 Set ab_local$soft      soft-iyonix/zip
-Set ab_soft$dir        <ab_res$dir>.soft.!Boot.Resources.SoftLoad
+Set ab_soft$dir        <ab_res$dir>.zips.!Boot.Resources.SoftLoad
 Set ab_local$translate translate-iyonix/zip
 
 | Remove any old crud from our resources directory
-x Wipe <ab_res$dir>.zip ~cfr~v
-Remove <ab_res$dir>.soft.LICENSE
-Remove <ab_soft$dir>.riscos
+x Wipe <ab_res$dir>.zip       ~cfr~v
+x Wipe <ab_res$dir>.zips      ~cfr~v
 x Wipe <ab_res$dir>.translate ~cfr~v
 Remove <ab_res$dir>.<ab_local$zip>
 Remove <ab_res$dir>.<ab_local$soft>

Resources/Tungsten/release_autobuild,feb

@@ -18,8 +18,10 @@ IfThere <Build$Dir>.Images.<Build$ImageName> Then Else Obey
 | Run our clean script
 Run <ab_res$dir>.clean
 
-| Prepare the ROM build zipfile
+| Prepare the ROM build zip directory
 CDir <ab_res$dir>.zip
+
+| Populate the ROM Build zip directory
 Copy ab_res:LICENSE                       <ab_res$dir>.zip.LICENSE ~cf~r~v
 Copy ab_res:ReadMe/txt                    <ab_res$dir>.zip.ReadMe/txt ~cf~r~v
 Do rompress -vZps 4M <Build$Dir>.Images.<Build$ImageName> <ab_res$dir>.zip.riscos
@@ -30,15 +32,24 @@ Do zip -9qr ^.<ab_local$zip> *
 SetType <ab_res$dir>.<ab_local$zip> &A91
 Back
 
-| Prepare the softload zipfile
-CDir <ab_res$dir>.soft
-Copy ab_res:LICENSE <ab_res$dir>.soft.LICENSE ~cf~r~v
-Copy ab_res:SoftLoad <ab_soft$dir>.SoftLoad ~cf~v
-Copy ab_res:Prompt <ab_soft$dir>.Prompt ~cf~v
+| Prepare the softload zip directory
+Do Mkdir -p <ab_soft$dir>
+
+| Populate the softload zip directory
+Copy ab_res:LICENSE <ab_res$dir>.zips.LICENSE ~cf~r~v
+Copy ab_res:soft.ReadMe/txt <ab_res$dir>.zips.ReadMe/txt ~cf~r~v
+Copy ab_res:soft.!Run       <ab_soft$dir>.* ~cf~v
+Copy ab_res:soft.Loader     <ab_soft$dir>.* ~cf~v
+Copy ab_res:soft.SoftLoad   <ab_soft$dir>.* ~cf~v
+Run BasCrunch -1 ab_res:soft.Prompt <ab_soft$dir>.Prompt
 Copy <ab_res$dir>.zip.riscos <ab_soft$dir>.riscos ~cf~r~v
 
+| Copy pre-EDID specific softload support
+Do Mkdir -p <ab_res$dir>.zips.!Boot.Choices.Boot.PreDesk
+Copy ab_res:Configure <ab_res$dir>.zips.!Boot.Choices.Boot.PreDesk.Configure ~cfr~v
+
 | Create a zip archive with the required files in it
-Dir <ab_res$dir>.soft
+Dir <ab_res$dir>.zips
 Do zip -9qr ^.<ab_local$soft> *
 SetType <ab_res$dir>.<ab_local$soft> &A91
 Back

Resources/Tungsten/soft/!Boot/Resources/SoftLoad/Loader,feb

-| >!Boot.Resources.SoftLoad.Loader
-| Copyright  2010, RISC OS Open
-| All rights reserved.
-|
-| RISC OS ROM softload utility
-
-| Ensure that !System is available...
-SetEval SoftLoad$Sys 0
-If "<System$Dir>" = "" Then SetEval SoftLoad$Sys 1
-If SoftLoad$Sys Then Set System$Dir Boot:Resources.!System
-If SoftLoad$Sys Then Run <System$Dir>.SysPaths
-
-| Load the SharedCLibrary if we need to...
-RMEnsure SharedCLibrary 5.46 RMLoad System:Modules.CLib
-RMEnsure SharedCLibrary 5.46 Error The softloader requires SharedCLibrary 5.46 or later
-
-| Softload the new ROM and reboot into it...
-Run <SoftLoad$Dir>.SoftLoad -v <SoftLoad$Dir>.riscos
\ No newline at end of file