From 89db63cdb73696abfe7a96522bab3b6e5ac8c4bb Mon Sep 17 00:00:00 2001 From: Martin Avison <git@avisoft.f9.co.uk> Date: Sun, 15 Jan 2023 17:01:49 +0000 Subject: [PATCH] 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/Generic/Prompt,ffb | Bin 1737 -> 0 bytes .../SoftLoad => Generic/soft}/!Run,feb | 0 .../SoftLoad => Generic/soft}/Loader,feb | 5 +- Resources/Generic/soft/Prompt,fd1 | 65 ++++++++++++++++++ Resources/Generic/{ => soft}/SoftLoad,ff8 | Bin Resources/IOMDHAL/clean,feb | 7 +- Resources/IOMDHAL/release_autobuild,feb | 25 +++++-- .../soft/!Boot/Resources/SoftLoad/Loader,feb | 18 ----- .../{!Boot/Resources/SoftLoad => }/!Run,feb | 0 Resources/IOMDHALDev/clean,feb | 2 - Resources/IOMDHALDev/release_autobuild,feb | 16 ++--- .../soft/!Boot/Resources/SoftLoad/Loader,feb | 18 ----- Resources/TitaniumDev/clean,feb | 1 - Resources/TitaniumDev/release_autobuild,feb | 16 ++--- .../soft/!Boot/Resources/SoftLoad/!Run,feb | 11 --- Resources/TitaniumDev/soft/ReadMe.txt | 6 +- Resources/Tungsten/clean,feb | 7 +- Resources/Tungsten/release_autobuild,feb | 25 +++++-- .../soft/!Boot/Resources/SoftLoad/Loader,feb | 18 ----- .../{!Boot/Resources/SoftLoad => }/!Run,feb | 0 Resources/Tungsten/soft/ReadMe.txt | 6 +- Resources/TungstenDev/clean,feb | 2 - Resources/TungstenDev/release_autobuild,feb | 28 ++++---- .../soft/!Boot/Resources/SoftLoad/!Run,feb | 11 --- .../soft/!Boot/Resources/SoftLoad/Loader,feb | 18 ----- Resources/TungstenDev/soft/ReadMe.txt | 6 +- VersionNum | 20 +++--- 27 files changed, 158 insertions(+), 173 deletions(-) delete mode 100644 Resources/Generic/Prompt,ffb rename Resources/{IOMDHALDev/soft/!Boot/Resources/SoftLoad => Generic/soft}/!Run,feb (100%) rename Resources/{TitaniumDev/soft/!Boot/Resources/SoftLoad => Generic/soft}/Loader,feb (71%) create mode 100644 Resources/Generic/soft/Prompt,fd1 rename Resources/Generic/{ => soft}/SoftLoad,ff8 (100%) delete mode 100644 Resources/IOMDHAL/soft/!Boot/Resources/SoftLoad/Loader,feb rename Resources/IOMDHAL/soft/{!Boot/Resources/SoftLoad => }/!Run,feb (100%) delete mode 100644 Resources/IOMDHALDev/soft/!Boot/Resources/SoftLoad/Loader,feb delete mode 100644 Resources/TitaniumDev/soft/!Boot/Resources/SoftLoad/!Run,feb delete mode 100644 Resources/Tungsten/soft/!Boot/Resources/SoftLoad/Loader,feb rename Resources/Tungsten/soft/{!Boot/Resources/SoftLoad => }/!Run,feb (100%) delete mode 100644 Resources/TungstenDev/soft/!Boot/Resources/SoftLoad/!Run,feb delete mode 100644 Resources/TungstenDev/soft/!Boot/Resources/SoftLoad/Loader,feb diff --git a/Resources/Generic/Prompt,ffb b/Resources/Generic/Prompt,ffb deleted file mode 100644 index 3fd38a07eea991981950fdebac14eaba00379e63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1737 zcma)+O>^5s7{~WOc$ujNXiF%iz&~n2?4ZbY(lpRC367l<lhp25E}5JdMcUZgD3Z{w z>!=ql95^tX;Un-3xG-GH+o#~r6Nk=dxWcot-M9s2@WGaLpM75bzyI1`Y#~D}iqk}N zdkRbC%5~ISsRE7;_j+LzMBNm7$~PFB%IIr5!=CVXD7lY*=<@`s$5D-4kA6lw7CzyL z6j6vJyNrSkFh^TvagCDfWJsevPTUk>q|ld~vIvPIL3R15$72N%!i!GgK)9jDF%YVk zR~qH9Da&GpgHe{~P`Px#r6X~Q=x8z&t{OLgErb5_l!|YZN`t|`cJs#VDCw4h;aIY? z*Qjkbo$W<xetfWz;cggkDUtBc`XZs>4^y}?wdc8q)O6qu5G8QC38y_3>GlVSP$KMF zkkOGExCy6hw=(!bsze<2)l&+N<^riO89*AkA<U|ShGSx@>NFgS(lj&dH##4+?sl+W zZMUn<PGj3atBqQ#S#NY2ttP$gpxQjZZlhVZz)3%1#ZTizPeH8;tu6PpkTjjcHG(Gu zaYPaNUB=uKN5Z24!*1X0a&)8nJPBzo#5_3>QgfEnq;|+`hCrMM<*Iz~%pVifw2RI! zXV{q8iXvs#dJ*X^?fm6V!s}cf+cPr`Nftz|Z{JDC1O)H`<v#Q2ciO3C3+;weLyKmO zd1$bUmorp@0J)bnD#?@k`G~LSs?%h<@qu>hc8*2YKwpVKs1%EE<*{}nsgqkM#lQ`f z#;FnNScAR(oWU-wQz73cfCZ^_<VDDS97l=Dg}X(<xM6BJ<k|;3A?f@z)H`|4277}N zT)y(~TeIbSx|J$!TB~KNvb2itVR>@~dz1FBTzmv?ZhaMB=%3{kd}Xk=N{?aQ{?qFz z9>NhEzAF*(KF5{=soX@b7w(ms#Z8z7dz;d{b8cbh6qOZJ42Da;Lvn8p>!_5eRvBMn zk=AE6fyelvP+2aT1!t6IAQE3&*j&>`OtQzZh8gPdRF`yB4^)wM4Q5^dj(IvuX@4wK z%H^WLuD%RB{Cc?hv%zN1={xrmOloRwT0aAH3nG2>d*ma7y?b7-QN+il1@j)o&6|3K z8k?UtTe}2i><5asZJQzrv%`pmc0a^Ty}d_xX6qu^u=Nv93|7o5Q#0QfY~dvx|GB~5 zdu4b~54KJh+<F1{#bAq5e;CZ3)&+MtO+GG2rAnk^dFoe#Rp?=9g(&Pt{lL%v!UAzj z7w60$`K1Z@K%26Vj#(_z!D|yNR{n#<^|c8WhjcykH5&-Bv=@c+LaZmC&;(KF%OQu= ze{y*LX$~JuaJccW9M;Ah4m5|9M!$J=D3+GxfJ*`~z6ei1tp5)X8xtTl#~?m@21NBm iszoHWG>O_pU9x#5EHzV~`psb5uRi0po#zSfUw;Fx;{6{0 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 793fd3b..8050ccd 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 0000000..31d3d7e --- /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 8d9f8c6..bd39911 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 20ccbbd..1d02b06 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 9f6c7f2..0000000 --- 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 78aeb35..c175395 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 769d7e8..362ce07 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 9f6c7f2..0000000 --- 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 928d89d..f3a2ee5 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 8f54ecf..999d891 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 7c54fc3..0000000 --- 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 f97a2db..a9f9e33 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 7e6a1c7..221e166 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 4de72a3..f881d67 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 793fd3b..0000000 --- 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 a254fc4..264d69b 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 7cb390a..78e5f39 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 3bfd85c..4042353 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 7c54fc3..0000000 --- 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 793fd3b..0000000 --- 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 a254fc4..264d69b 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 2c93af2..6f03b22 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" -- GitLab