Commit 95f451ac authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Conditionally ensure AUNMsgs

Internet 5.61 and later doesn't need AUNMsgs, so don't try loading them. The default softloaded Internet (5.40) however does, so do in that case.
Sprinkle in a couple of comments, rename Test$Eval into Inet$ name space.

Version 5.64. Tagged as 'Internet-5_64'
parent 02265f6a
......@@ -17,7 +17,7 @@ Set System$Path_Message System resources not found. Please run !System before !I
IF "<BootResources$Path>" = "" THEN Set BootResources$Path <Boot$Dir>.Resources.
IF "<System$Path>" = "" THEN IfThere BootResources:!System Then /BootResources:!System
Set Alias$RMIfThere SetEval Test$Eval 1|MRMEnsure %%1 0 SetEval Test$Eval 0|MIf Test$Eval THEN %%0 %%1|MUnset Test$Eval
Set Alias$RMIfThere SetEval Inet$TestEval 1|MRMEnsure %%1 0 SetEval Inet$TestEval 0|MIf Inet$TestEval THEN %%0 %%1|MUnset Inet$TestEval
Set Alias$CheckError IF "|<Inet$Error>" <> "" THEN Set Boot$Error |<Inet$Error>||MError |<Inet$Error>
RMIfThere RMKill Net
......@@ -37,8 +37,14 @@ If Inet$BadMbufManager THEN X Unplug MbufManager
If Inet$BadMbufManager THEN Error Please shutdown the computer, then restart it
Unset Inet$BadMbufManager
RMEnsure AUNMsgs 0.07 RMLoad System:Modules.Network.AUNMsgs
RMEnsure AUNMsgs 0.07 Error !Internet requires AUNMsgs 0.07 or later
| See if AUNMsgs are expected
SetEval Inet$NeedsAUNMsgs 0
RMEnsure Internet 5.61 SetEval Inet$NeedsAUNMsgs 1
If Inet$NeedsAUNMsgs THEN RMEnsure AUNMsgs 0.07 RMLoad System:Modules.Network.AUNMsgs
If Inet$NeedsAUNMsgs THEN RMEnsure AUNMsgs 0.07 Error !Internet requires AUNMsgs 0.07 or later
Unset Inet$NeedsAUNMsgs
| Check the core of the stack is new enough
RMEnsure Internet 5.40 RMLoad System:Modules.Network.Internet
RMEnsure Internet 5.40 Error !Internet requires Internet 5.40 or later
RMEnsure MbufManager 0.17 RMLoad System:Modules.Network.MManager
......@@ -46,6 +52,7 @@ RMEnsure MbufManager 0.17 Error !Internet requires MbufManager 0.17 or later
SetEval Inet$KickFiler 0
| Bring back up the rest of the (enabled/configured) stack
IfThere Choices:Internet.Startup Then Run Choices:Internet.Startup Else Error Your !Internet application has not yet been configured. Please use InetSetup to configure it.
IfThere Choices:Internet.User Then Run Choices:Internet.User
......
/* (5.63)
/* (5.64)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.63
#define Module_MajorVersion_CMHG 5.64
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Jul 2018
#define Module_Date_CMHG 11 Aug 2018
#define Module_MajorVersion "5.63"
#define Module_Version 563
#define Module_MajorVersion "5.64"
#define Module_Version 564
#define Module_MinorVersion ""
#define Module_Date "21 Jul 2018"
#define Module_Date "11 Aug 2018"
#define Module_ApplicationDate "21-Jul-18"
#define Module_ApplicationDate "11-Aug-18"
#define Module_ComponentName "Internet"
#define Module_ComponentPath "mixed/RiscOS/Sources/SystemRes/Internet"
#define Module_FullVersion "5.63"
#define Module_HelpVersion "5.63 (21 Jul 2018)"
#define Module_LibraryVersionInfo "5:63"
#define Module_FullVersion "5.64"
#define Module_HelpVersion "5.64 (11 Aug 2018)"
#define Module_LibraryVersionInfo "5:64"
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