Commit 511a1960 authored by Robert Sprowson's avatar Robert Sprowson

Update to baseline Wimp version

Previously 3.98 (the nested Wimp supplied with the browser/Java CD), now 5.15.
While not wanting to belittle 117 versions, many of which were STB resource refinements, the main highlights are probably
 * 4.10 UTF8 support
 * 4.82 features contemporary with RISC OS 4.02
 * 4.84 support hires Sprites11
 * 4.85 support searching Wimp$IconTheme
 * 5.13 zero page safe and VFP contexts
 * 5.15 preset Wimp$IconTheme <-- that's the change !Boot was waiting for

RO310/350/360/370/400Hook: PreDesktop files updated to load the newer Wimp
RO430Hook: Unfortunately the ROM copy of the Wimp in 4.39 is already > the themed nested Wimp, but since the RO430Hook is only a skeleton (to allow softloading of RISC OS 5) there's little to gain by loading a Wimp
RO360Hook: Trim out licence from installed !Run file
RO400Hook: Reenable the default monitor definition in the NoVRAM case

Version 1.16. Tagged as 'Boot-1_16'
parent 9ef8c4e6
......@@ -10,12 +10,12 @@
| which needs changing.
|End
|Start Acorn WindowManager 3.98 installation
| ------------------------------------------
|Start Acorn WindowManager 5.15 installation
| ---------------------------------------
|
| Nested Window Manager installation
| Nested Theme Window Manager
|
| ------------------------------------------
| ---------------------------------------
|
| Load the Window Manager from !System, then ensure that we have all
| the necessary sprites etc present.
......@@ -24,18 +24,19 @@ If "<BootResources$Path>"="" Then Set BootResources$Path Boot:Resources.
If "<Boot$OSVersion>"="3.50" Then SetMacro Run$Path ,%.,Boot:Library.
If "<Boot$OSVersion>"="3.50" Then Set Boot$OSVersion 350
If "<System$Path>"="" Then Run BootResources:!System
RMEnsure WindowManager 3.98 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 3.98 Run WindowManager:LoadWimp
RMEnsure WindowManager 5.15 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 5.15 Run WindowManager:LoadWimp
If Boot$OSVersion < 350 Then RMEnsure DragASprite 0.10 RMLoad System:Modules.DragASprit
If Boot$OSVersion < 350 Then IconSprites BootResources:Wimp.310Spr
If Boot$OSVersion < 400 Then IconSprites BootResources:Wimp.371Spr
|End
|Start Acorn !ThemeDefs 0.04 Loading
| ------------------------------------------
| ---------------------------
|
| Theme variables
|
| ------------------------------------------
| ---------------------------
|
| Look ahead to any user theme setup so that the Wimp$IconTheme can be known
| prior to doing the numerous AddApp operations below (which uses *ICONSPRITES).
......
......@@ -10,12 +10,12 @@
| which needs changing.
|End
|Start Acorn WindowManager 3.98 installation
| ------------------------------------------
|Start Acorn WindowManager 5.15 installation
| ---------------------------------------
|
| Nested Window Manager installation
| Nested Theme Window Manager
|
| ------------------------------------------
| ---------------------------------------
|
| Load the Window Manager from !System, then ensure that we have all
| the necessary sprites etc present.
......@@ -24,18 +24,19 @@ If "<BootResources$Path>"="" Then Set BootResources$Path Boot:Resources.
If "<Boot$OSVersion>"="3.50" Then SetMacro Run$Path ,%.,Boot:Library.
If "<Boot$OSVersion>"="3.50" Then Set Boot$OSVersion 350
If "<System$Path>"="" Then Run BootResources:!System
RMEnsure WindowManager 3.98 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 3.98 Run WindowManager:LoadWimp
RMEnsure WindowManager 5.15 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 5.15 Run WindowManager:LoadWimp
If Boot$OSVersion < 350 Then RMEnsure DragASprite 0.10 RMLoad System:Modules.DragASprit
If Boot$OSVersion < 350 Then IconSprites BootResources:Wimp.310Spr
If Boot$OSVersion < 400 Then IconSprites BootResources:Wimp.371Spr
|End
|Start Acorn !ThemeDefs 0.04 Loading
| ------------------------------------------
| ---------------------------
|
| Theme variables
|
| ------------------------------------------
| ---------------------------
|
| Look ahead to any user theme setup so that the Wimp$IconTheme can be known
| prior to doing the numerous AddApp operations below (which uses *ICONSPRITES).
......
| Copyright 1996 Acorn Computers Ltd
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
| You may obtain a copy of the License at
|
| http://www.apache.org/licenses/LICENSE-2.0
|
| Unless required by applicable law or agreed to in writing, software
| distributed under the License is distributed on an "AS IS" BASIS,
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
| See the License for the specific language governing permissions and
| limitations under the License.
|
| > SoundDMA.!Run
RMEnsure SoundDMA 1.53 Run <Obey$Dir>.NewSound
RMEnsure SoundDMA 1.53 Error You need SoundDMA 1.53 or later
......
......@@ -10,12 +10,12 @@
| which needs changing.
|End
|Start Acorn WindowManager 3.98 installation
| ------------------------------------------
|Start Acorn WindowManager 5.15 installation
| ---------------------------------------
|
| Nested Window Manager installation
| Nested Theme Window Manager
|
| ------------------------------------------
| ---------------------------------------
|
| Load the Window Manager from !System, then ensure that we have all
| the necessary sprites etc present.
......@@ -24,18 +24,19 @@ If "<BootResources$Path>"="" Then Set BootResources$Path Boot:Resources.
If "<Boot$OSVersion>"="3.50" Then SetMacro Run$Path ,%.,Boot:Library.
If "<Boot$OSVersion>"="3.50" Then Set Boot$OSVersion 350
If "<System$Path>"="" Then Run BootResources:!System
RMEnsure WindowManager 3.98 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 3.98 Run WindowManager:LoadWimp
RMEnsure WindowManager 5.15 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 5.15 Run WindowManager:LoadWimp
If Boot$OSVersion < 350 Then RMEnsure DragASprite 0.10 RMLoad System:Modules.DragASprit
If Boot$OSVersion < 350 Then IconSprites BootResources:Wimp.310Spr
If Boot$OSVersion < 400 Then IconSprites BootResources:Wimp.371Spr
|End
|Start Acorn !ThemeDefs 0.04 Loading
| ------------------------------------------
| ---------------------------
|
| Theme variables
|
| ------------------------------------------
| ---------------------------
|
| Look ahead to any user theme setup so that the Wimp$IconTheme can be known
| prior to doing the numerous AddApp operations below (which uses *ICONSPRITES).
......
......@@ -10,12 +10,12 @@
| which needs changing.
|End
|Start Acorn WindowManager 3.98 installation
| ------------------------------------------
|Start Acorn WindowManager 5.15 installation
| ---------------------------------------
|
| Nested Window Manager installation
| Nested Theme Window Manager
|
| ------------------------------------------
| ---------------------------------------
|
| Load the Window Manager from !System, then ensure that we have all
| the necessary sprites etc present.
......@@ -24,18 +24,19 @@ If "<BootResources$Path>"="" Then Set BootResources$Path Boot:Resources.
If "<Boot$OSVersion>"="3.50" Then SetMacro Run$Path ,%.,Boot:Library.
If "<Boot$OSVersion>"="3.50" Then Set Boot$OSVersion 350
If "<System$Path>"="" Then Run BootResources:!System
RMEnsure WindowManager 3.98 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 3.98 Run WindowManager:LoadWimp
RMEnsure WindowManager 5.15 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 5.15 Run WindowManager:LoadWimp
If Boot$OSVersion < 350 Then RMEnsure DragASprite 0.10 RMLoad System:Modules.DragASprit
If Boot$OSVersion < 350 Then IconSprites BootResources:Wimp.310Spr
If Boot$OSVersion < 400 Then IconSprites BootResources:Wimp.371Spr
|End
|Start Acorn !ThemeDefs 0.04 Loading
| ------------------------------------------
| ---------------------------
|
| Theme variables
|
| ------------------------------------------
| ---------------------------
|
| Look ahead to any user theme setup so that the Wimp$IconTheme can be known
| prior to doing the numerous AddApp operations below (which uses *ICONSPRITES).
......
|oadModeFile BootResources:Configure.Monitors.Acorn.AKF60
LoadModeFile BootResources:Configure.Monitors.Acorn.AKF60
WimpMode X1024 Y768 C256
......@@ -10,12 +10,33 @@
| which needs changing.
|End
|Start RISCOS WindowManager 5.15 installation
| ---------------------------------------
|
| Nested Theme Window Manager
|
| ---------------------------------------
|
| Load the Window Manager from !System, then ensure that we have all
| the necessary sprites etc present.
|
If "<BootResources$Path>"="" Then Set BootResources$Path Boot:Resources.
If "<Boot$OSVersion>"="3.50" Then SetMacro Run$Path ,%.,Boot:Library.
If "<Boot$OSVersion>"="3.50" Then Set Boot$OSVersion 350
If "<System$Path>"="" Then Run BootResources:!System
RMEnsure WindowManager 5.15 Set WindowManager$Path BootResources:Wimp.,Resources:$.Resources.Wimp.
RMEnsure WindowManager 5.15 Run WindowManager:LoadWimp
If Boot$OSVersion < 350 Then RMEnsure DragASprite 0.10 RMLoad System:Modules.DragASprit
If Boot$OSVersion < 350 Then IconSprites BootResources:Wimp.310Spr
If Boot$OSVersion < 400 Then IconSprites BootResources:Wimp.371Spr
|End
|Start RISCOS !ThemeDefs 0.04 Loading
| ------------------------------------------
| ---------------------------
|
| Theme variables
|
| ------------------------------------------
| ---------------------------
|
| Look ahead to any user theme setup so that the Wimp$IconTheme can be known
| prior to doing the numerous AddApp operations below (which uses *ICONSPRITES).
......
......@@ -11,11 +11,11 @@
|End
|Start RISCOS !ThemeDefs 0.04 Loading
| ------------------------------------------
| ---------------------------
|
| Theme variables
|
| ------------------------------------------
| ---------------------------
|
| Look ahead to any user theme setup so that the Wimp$IconTheme can be known
| prior to doing the numerous AddApp operations below (which uses *ICONSPRITES).
......
/* (1.15)
/* (1.16)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.15
#define Module_MajorVersion_CMHG 1.16
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 May 2013
#define Module_Date_CMHG 04 May 2013
#define Module_MajorVersion "1.15"
#define Module_Version 115
#define Module_MajorVersion "1.16"
#define Module_Version 116
#define Module_MinorVersion ""
#define Module_Date "03 May 2013"
#define Module_Date "04 May 2013"
#define Module_ApplicationDate "03-May-13"
#define Module_ApplicationDate "04-May-13"
#define Module_ComponentName "Boot"
#define Module_ComponentPath "castle/RiscOS/Sources/SystemRes/Boot"
#define Module_FullVersion "1.15"
#define Module_HelpVersion "1.15 (03 May 2013)"
#define Module_LibraryVersionInfo "1:15"
#define Module_FullVersion "1.16"
#define Module_HelpVersion "1.16 (04 May 2013)"
#define Module_LibraryVersionInfo "1:16"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment