diff --git a/Resources/Generic/Prompt,ffb b/Resources/Generic/Prompt,ffb deleted file mode 100644 index 3fd38a07eea991981950fdebac14eaba00379e63..0000000000000000000000000000000000000000 Binary files a/Resources/Generic/Prompt,ffb and /dev/null differ diff --git a/Resources/IOMDHALDev/soft/!Boot/Resources/SoftLoad/!Run,feb b/Resources/Generic/soft/!Run,feb similarity index 100% rename from Resources/IOMDHALDev/soft/!Boot/Resources/SoftLoad/!Run,feb rename to Resources/Generic/soft/!Run,feb diff --git a/Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/Loader,feb b/Resources/Generic/soft/Loader,feb similarity index 71% rename from Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/Loader,feb rename to Resources/Generic/soft/Loader,feb index 793fd3bcb0f0f327e6652c46ec43d5176198f050..8050ccd09e94c24c1999c08d56df937b1fa49954 100644 --- a/Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/Loader,feb +++ b/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 \ No newline at end of file +| The -m 12M parm tries to ensure sufficient memory. +| 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. diff --git a/Resources/Generic/soft/Prompt,fd1 b/Resources/Generic/soft/Prompt,fd1 new file mode 100644 index 0000000000000000000000000000000000000000..31d3d7eed3cc89767c8eab38571bd702b094e473 --- /dev/null +++ b/Resources/Generic/soft/Prompt,fd1 @@ -0,0 +1,65 @@ +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 "Möchten 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 diff --git a/Resources/Generic/SoftLoad,ff8 b/Resources/Generic/soft/SoftLoad,ff8 similarity index 100% rename from Resources/Generic/SoftLoad,ff8 rename to Resources/Generic/soft/SoftLoad,ff8 diff --git a/Resources/IOMDHAL/clean,feb b/Resources/IOMDHAL/clean,feb index 8d9f8c69c8248d81029adf7a6c6fbff29aa1c001..bd399118659ba1895f27a36258468558e7d797e0 100644 --- a/Resources/IOMDHAL/clean,feb +++ b/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> diff --git a/Resources/IOMDHAL/release_autobuild,feb b/Resources/IOMDHAL/release_autobuild,feb index 20ccbbd104fe965c1440998961e4217db186af19..1d02b06f79815bef25a55237da022c38f20998dc 100644 --- a/Resources/IOMDHAL/release_autobuild,feb +++ b/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 diff --git a/Resources/IOMDHAL/soft/!Boot/Resources/SoftLoad/Loader,feb b/Resources/IOMDHAL/soft/!Boot/Resources/SoftLoad/Loader,feb deleted file mode 100644 index 9f6c7f2c32e1c3b349a773f8e5148aa52d724af0..0000000000000000000000000000000000000000 --- a/Resources/IOMDHAL/soft/!Boot/Resources/SoftLoad/Loader,feb +++ /dev/null @@ -1,18 +0,0 @@ -| >!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 diff --git a/Resources/IOMDHAL/soft/!Boot/Resources/SoftLoad/!Run,feb b/Resources/IOMDHAL/soft/!Run,feb similarity index 100% rename from Resources/IOMDHAL/soft/!Boot/Resources/SoftLoad/!Run,feb rename to Resources/IOMDHAL/soft/!Run,feb diff --git a/Resources/IOMDHALDev/clean,feb b/Resources/IOMDHALDev/clean,feb index 78aeb35f884be7a59d1d0fea7bf94a6935c70c43..c1753952b5d88e1ffb54520fad9aba8b2b98d066 100644 --- a/Resources/IOMDHALDev/clean,feb +++ b/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 diff --git a/Resources/IOMDHALDev/release_autobuild,feb b/Resources/IOMDHALDev/release_autobuild,feb index 769d7e8aa5a3e34057eee3fc6680d97672768ed6..362ce075fa1b13efe4aa7e0e90fa87a0faad6628 100644 --- a/Resources/IOMDHALDev/release_autobuild,feb +++ b/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 diff --git a/Resources/IOMDHALDev/soft/!Boot/Resources/SoftLoad/Loader,feb b/Resources/IOMDHALDev/soft/!Boot/Resources/SoftLoad/Loader,feb deleted file mode 100644 index 9f6c7f2c32e1c3b349a773f8e5148aa52d724af0..0000000000000000000000000000000000000000 --- a/Resources/IOMDHALDev/soft/!Boot/Resources/SoftLoad/Loader,feb +++ /dev/null @@ -1,18 +0,0 @@ -| >!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 diff --git a/Resources/TitaniumDev/clean,feb b/Resources/TitaniumDev/clean,feb index 928d89d1ad26823184f6afb843c516752a2dad95..f3a2ee5f0da462e7fae4a493eec1536ef3d44c1a 100644 --- a/Resources/TitaniumDev/clean,feb +++ b/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 diff --git a/Resources/TitaniumDev/release_autobuild,feb b/Resources/TitaniumDev/release_autobuild,feb index 8f54ecf30ef50173fca0224deb426c330392b975..999d891e492356265b9c750c8de36717ab56bd7f 100644 --- a/Resources/TitaniumDev/release_autobuild,feb +++ b/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 diff --git a/Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/!Run,feb b/Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/!Run,feb deleted file mode 100644 index 7c54fc3c07cd2c9e4452ac40cae70bba36d3fd69..0000000000000000000000000000000000000000 --- a/Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/!Run,feb +++ /dev/null @@ -1,11 +0,0 @@ -| >!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 diff --git a/Resources/TitaniumDev/soft/ReadMe.txt b/Resources/TitaniumDev/soft/ReadMe.txt index f97a2db1b71ecee0d0e6969b819ecf5f36ad4503..a9f9e333a392e93a340d51c3bf692a0579366b85 100644 --- a/Resources/TitaniumDev/soft/ReadMe.txt +++ b/Resources/TitaniumDev/soft/ReadMe.txt @@ -1,7 +1,7 @@ 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' diff --git a/Resources/Tungsten/clean,feb b/Resources/Tungsten/clean,feb index 7e6a1c78f6454c210c9807a280b468d5e2fc0451..221e16605eecc2f893ca9527a407723df67056f4 100644 --- a/Resources/Tungsten/clean,feb +++ b/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> diff --git a/Resources/Tungsten/release_autobuild,feb b/Resources/Tungsten/release_autobuild,feb index 4de72a31b910d2fd181e8ed97c4ab611a8612c12..f881d67dbfb9a4007a0f53c542439a9dc99fe962 100644 --- a/Resources/Tungsten/release_autobuild,feb +++ b/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 diff --git a/Resources/Tungsten/soft/!Boot/Resources/SoftLoad/Loader,feb b/Resources/Tungsten/soft/!Boot/Resources/SoftLoad/Loader,feb deleted file mode 100644 index 793fd3bcb0f0f327e6652c46ec43d5176198f050..0000000000000000000000000000000000000000 --- a/Resources/Tungsten/soft/!Boot/Resources/SoftLoad/Loader,feb +++ /dev/null @@ -1,18 +0,0 @@ -| >!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 diff --git a/Resources/Tungsten/soft/!Boot/Resources/SoftLoad/!Run,feb b/Resources/Tungsten/soft/!Run,feb similarity index 100% rename from Resources/Tungsten/soft/!Boot/Resources/SoftLoad/!Run,feb rename to Resources/Tungsten/soft/!Run,feb diff --git a/Resources/Tungsten/soft/ReadMe.txt b/Resources/Tungsten/soft/ReadMe.txt index a254fc40fe31676f2b0e02e7e3d1d63bc71a95c5..264d69bb7f8e9262b8b6f79cc4a011978a6b1e79 100644 --- a/Resources/Tungsten/soft/ReadMe.txt +++ b/Resources/Tungsten/soft/ReadMe.txt @@ -1,7 +1,7 @@ Softloader ========== -This is a ROM softloader patch for the IYONIX pc. +This is the ROM softloader for the IYONIX 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 patch --------------------- +Installing Softload +------------------- * Run the configure application by left double-clicking '!Boot' diff --git a/Resources/TungstenDev/clean,feb b/Resources/TungstenDev/clean,feb index 7cb390af766b023ba397a6fed2cef44174106745..78e5f391a05f40e1a79507e48e9b234bc4b0b4e5 100644 --- a/Resources/TungstenDev/clean,feb +++ b/Resources/TungstenDev/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 diff --git a/Resources/TungstenDev/release_autobuild,feb b/Resources/TungstenDev/release_autobuild,feb index 3bfd85c58e3eee8150c0ad5afd52e2e42be150c3..4042353053fb59ded1765ee563ae5cab221766ad 100644 --- a/Resources/TungstenDev/release_autobuild,feb +++ b/Resources/TungstenDev/release_autobuild,feb @@ -19,30 +19,26 @@ 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 - -| Copy the Apache licence file into the zip directory -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 - -| Compress 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 +Do Mkdir -p <ab_soft$dir> + +| Populate the softload 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 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 Do rompress -vZps 4M <Build$Dir>.Images.<Build$ImageName> <ab_soft$dir>.riscos | 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 Dir <ab_res$dir>.zip -| Create a zip archive with the required files in it +| Create a zip archive with the required Softload files in it Do zip -9qr ^.<ab_local$zip> * | Return the CSD to its original state diff --git a/Resources/TungstenDev/soft/!Boot/Resources/SoftLoad/!Run,feb b/Resources/TungstenDev/soft/!Boot/Resources/SoftLoad/!Run,feb deleted file mode 100644 index 7c54fc3c07cd2c9e4452ac40cae70bba36d3fd69..0000000000000000000000000000000000000000 --- a/Resources/TungstenDev/soft/!Boot/Resources/SoftLoad/!Run,feb +++ /dev/null @@ -1,11 +0,0 @@ -| >!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 diff --git a/Resources/TungstenDev/soft/!Boot/Resources/SoftLoad/Loader,feb b/Resources/TungstenDev/soft/!Boot/Resources/SoftLoad/Loader,feb deleted file mode 100644 index 793fd3bcb0f0f327e6652c46ec43d5176198f050..0000000000000000000000000000000000000000 --- a/Resources/TungstenDev/soft/!Boot/Resources/SoftLoad/Loader,feb +++ /dev/null @@ -1,18 +0,0 @@ -| >!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 diff --git a/Resources/TungstenDev/soft/ReadMe.txt b/Resources/TungstenDev/soft/ReadMe.txt index a254fc40fe31676f2b0e02e7e3d1d63bc71a95c5..264d69bb7f8e9262b8b6f79cc4a011978a6b1e79 100644 --- a/Resources/TungstenDev/soft/ReadMe.txt +++ b/Resources/TungstenDev/soft/ReadMe.txt @@ -1,7 +1,7 @@ Softloader ========== -This is a ROM softloader patch for the IYONIX pc. +This is the ROM softloader for the IYONIX 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 patch --------------------- +Installing Softload +------------------- * Run the configure application by left double-clicking '!Boot' diff --git a/VersionNum b/VersionNum index 2c93af2b41be917839e6441eca48b74643466fc3..6f03b2294887aeb7f8c4e762dbc06b6fffe817bd 100644 --- a/VersionNum +++ b/VersionNum @@ -1,21 +1,21 @@ -/* (1.07) +/* (1.08) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 1.07 +#define Module_MajorVersion_CMHG 1.08 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 11 Jan 2023 +#define Module_Date_CMHG 15 Feb 2023 -#define Module_MajorVersion "1.07" -#define Module_Version 107 +#define Module_MajorVersion "1.08" +#define Module_Version 108 #define Module_MinorVersion "" -#define Module_Date "11 Jan 2023" +#define Module_Date "15 Feb 2023" -#define Module_ApplicationDate "11-Jan-23" +#define Module_ApplicationDate "15-Feb-23" #define Module_ComponentName "ABRelease" -#define Module_FullVersion "1.07" -#define Module_HelpVersion "1.07 (11 Jan 2023)" -#define Module_LibraryVersionInfo "1:7" +#define Module_FullVersion "1.08" +#define Module_HelpVersion "1.08 (15 Feb 2023)" +#define Module_LibraryVersionInfo "1:8"