summaryrefslogtreecommitdiff
path: root/!NetSurf/!Run,feb
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2005-01-05 20:09:49 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2005-01-05 20:09:49 +0000
commita5ba474aee2921e5eb39d4dd7dd80c648e44a1b8 (patch)
tree7f5a21a3b3cbaf4c4436fcbebcd352ba91a71b35 /!NetSurf/!Run,feb
parentbd1742d88271bc836379affcde6ca5b61d3708b4 (diff)
downloadnetsurf-a5ba474aee2921e5eb39d4dd7dd80c648e44a1b8.tar.gz
netsurf-a5ba474aee2921e5eb39d4dd7dd80c648e44a1b8.tar.bz2
[project @ 2005-01-05 20:09:49 by jmb]
Check for existence of modules before trying to load them. This will fall over if the user doesn't have *IfThere on their system. That would mean they haven't got the Universal Boot installed, however, so I doubt it's an issue. svn path=/import/netsurf/; revision=1433
Diffstat (limited to '!NetSurf/!Run,feb')
-rw-r--r--!NetSurf/!Run,feb23
1 files changed, 15 insertions, 8 deletions
diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb
index a8aac293d..acf33fe35 100644
--- a/!NetSurf/!Run,feb
+++ b/!NetSurf/!Run,feb
@@ -1,4 +1,4 @@
-| Run file for NetSurf. ( $Revision: 1.32 $ )
+| Run file for NetSurf. ( $Revision: 1.33 $ )
|
| This file ensures that the system resources required by NetSurf are
| present. Additionally, it forces setting of system variables related
@@ -19,45 +19,52 @@ RMEnsure WindowManager 3.80 Error NetSurf requires the Nested Window Manager. Th
| Ensure the System resource exists - can't do much if it doesn't
If "<System$Path>" = "" Then Set System$Path_Message System resources not found.
+| Define this alias for clarity
+| Syntax: NetSurfRMLoad <Path to module>
+Set Alias$NetSurfRMLoad IfThere %%*0 Then RMLoad %%*0
+
| Ensure CallASWI is installed
| http://www.iyonix.com/32bit/
-RMEnsure UtilityModule 3.70 RMEnsure CallASWI 0.02 RMLoad System:Modules.CallASWI
+RMEnsure UtilityModule 3.70 RMEnsure CallASWI 0.02 NetSurfRMLoad System:Modules.CallASWI
RMEnsure UtilityModule 3.70 RMEnsure CallASWI 0.02 Error NetSurf requires the CallASWI module. This can be downloaded from http://www.iyonix.com/32bit/system.shtml
| Ensure DrawFile module is installed
| http://acorn.riscos.com/riscos/releases/drawfile.arc
| Should be installed in !System.310.Modules
-RMEnsure DrawFile 1.30 RMLoad System:Modules.DrawFile
+RMEnsure DrawFile 1.30 NetSurfRMLoad System:Modules.DrawFile
RMEnsure DrawFile 1.30 Error NetSurf requires the DrawFile module. An old verson of this can be downloaded from http://acorn.riscos.com/riscos/releases/drawfile.arc
| Ensure SharedUnixLibrary is installed
| http://www.chocky.org/unix/usage.html
-RMEnsure SharedUnixLibrary 1.02 RMLoad System:Modules.SharedULib
+RMEnsure SharedUnixLibrary 1.02 NetSurfRMLoad System:Modules.SharedULib
RMEnsure SharedUnixLibrary 1.02 Error NetSurf requires SharedUnixLibrary 1.02 or later. This can be downloaded from http://www.chocky.org/unix/usage.html
| Load AcornURI if it isn't already
| http://sudden.recoil.org/
Unset NetSurf$Start_URI_Handler
RMEnsure AcornURI 0.12 Set NetSurf$Start_URI_Handler 1
-RMEnsure AcornURI 0.12 RMLoad System:Modules.Network.URI
+RMEnsure AcornURI 0.12 NetSurfRMLoad System:Modules.Network.URI
RMEnsure AcornURI 0.12 Error NetSurf requires AcornURI 0.12 or later. A version of this can be found at http://sudden.recoil.org/others/
RMEnsure AcornURI 0.12 Unset NetSurf$Start_URI_Handler
| Check for mime map module
If "<InetDBase$Path>" = "" Then Error Inet databases can not be found
If "<Inet$MimeMappings>" = "" Then Set Inet$MimeMappings InetDBase:MimeMap
-RMEnsure MimeMap 0.10 RMLoad System:Modules.Network.MimeMap
+RMEnsure MimeMap 0.10 NetSurfRMLoad System:Modules.Network.MimeMap
RMEnsure MimeMap 0.10 Error NetSurf requires MimeMap 0.10 or later
| Ensure Tinct is loaded
| http://www.tinct.net
-RMEnsure Tinct 0.09 RMLoad System:Modules.Tinct
+RMEnsure Tinct 0.09 NetSurfRMLoad System:Modules.Tinct
RMEnsure Tinct 0.09 Error NetSurf requires Tinct 0.09 or later. This can be downloaded from http://www.tinct.net
| Ensure Iconv
| http://moose.mine.nu:6888/iconv002.zip
| Not an error if not present - there'll be no charset conversion.
-RMEnsure Iconv 0.02 IfThere System:Modules.Iconv Then RMLoad System:Modules.Iconv
+RMEnsure Iconv 0.02 NetSurfRMLoad System:Modules.Iconv
+
+| No longer need this alias
+Unset Alias$NetSurfRMLoad
WimpSlot -min 2240k -max 2240k
Run <NetSurf$Dir>.!RunImage %*0 2><NetSurf$Dir>.stderr \ No newline at end of file