From 5a50b7d770fa18d237aff9f682d4c1755dc2acc6 Mon Sep 17 00:00:00 2001
From: Steve Revill <srevill@gitlab.riscosopen.org>
Date: Wed, 16 Feb 2011 20:00:36 +0000
Subject: [PATCH] Fixed the CTools build "Make" entry in the components file.

Also pruned a lot of dead components from the ModuleDB file. I have been
unable to locate sources for any of them in either the closed source or
published source repositories.

Version 5.08. Tagged as 'BuildSys-5_08'
---
 Components/ROOL/CTools |  2 +-
 ModuleDB               | 24 ------------------------
 VersionNum             | 20 ++++++++++----------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/Components/ROOL/CTools b/Components/ROOL/CTools
index 38e1cda..91afbcf 100644
--- a/Components/ROOL/CTools
+++ b/Components/ROOL/CTools
@@ -144,7 +144,7 @@ diff                    -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools
 find                    -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
 libfile                 -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
 link                    -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
-make                    -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools
+make                    -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
 modsqz                  -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
 objasm                  -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
 objsize                 -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
diff --git a/ModuleDB b/ModuleDB
index 8592e11..72d729b 100644
--- a/ModuleDB
+++ b/ModuleDB
@@ -69,9 +69,6 @@ NumConvert              C       Lib.NumConvert
 Unicode                 RES     SystemRes.Unicode
 TGRLib                  EXP     Lib.TGRlib
 NSPRLib                 EXP     Lib.NSPRLib
-SNMPheaders             EXP     Lib.SNMPLibs.headers
-SNMPMIBs                EXP     Lib.SNMPLibs.mibs
-SNMPLib                 EXP     Lib.SNMPLibs.snmplib
 ConfigLib               C       Lib.Configure
 PRISMLib                EXP     Lib.PRISMLib
 
@@ -84,7 +81,6 @@ Boot                    RES     Apps.Boot
 SoundRes                RES     Audio.SoundRes
 PrintDefs               RES     Printing.PrintDefs
 AutoDemo                RES     Apps.AutoDemo
-Terminal                RES     Apps.Terminal
 # Components inside SystemRes.STB.Baseline
 STBBoot                 RES     SystemRes.STB.Baseline.STBBoot
 STBChoices              RES     SystemRes.STB.Baseline.STBChoices
@@ -129,8 +125,6 @@ ResetPtr                RES     SystemRes.STB.Utilities.ResetPtr
 STBBootVar              RES     SystemRes.STB.Utilities.BootVars
 Unique                  RES     SystemRes.STB.Utilities.Unique
 WhatSTB                 RES     SystemRes.STB.Utilities.WhatSTB
-# FreeTerm is for the ONC2UK build only.
-FreeTerm                RES     Apps.FreeTerm
 #
 #----------------------------------------------------------------------------------------------------------
 #
@@ -164,7 +158,6 @@ WebServe                C       Apps.WebServe                           Apps
 PhoebeSampler           C       Apps.Sampler                            Apps                    Sampler
 ResEd                   C       Apps.Toolbox.ResEd                      Apps                    ResEd
 ResTest                 C       Apps.Toolbox.ResTest                    Apps                    ResTest
-ResCommon               C       Apps.Toolbox.ResCommon                  Apps                    ResCommon
 ResCreate               C       Apps.Toolbox.ResCreate                  Apps                    ResCreate
 UpgradeCreater          C       Apps.Upgrade.UpgCreate                  Apps                    UpgCreate
 UpgradeFetcher          RES     Apps.Upgrade.UpgFetch                   Apps                    UpgFetch
@@ -225,8 +218,6 @@ FileSwitch              ASM     FileSys.FileSwitch                      FileSys
 ResourceFS              ASM     FileSys.ResourceFS.ResourceFS           FileSys                 ResourceFS
 ADFSFiler               ASM     FileSys.ADFS.ADFSFiler                  FileSys                 ADFSFiler
 FileCore                ASM     FileSys.FileCore                        FileSys                 FileCore
-ADFS                    ASM     FileSys.ADFS.ADFS                       FileSys                 ADFS
-IDEPodule               ASM     FileSys.ADFS.ADFS.Test.Tungsten.IDEPodule FileSys               IDEPodule
 RamFS                   ASM     FileSys.RAMFS.RAMFS                     FileSys                 RAMFS
 FSLock                  ASM     FileSys.FSLock                          FileSys                 FSLock
 NetFS                   ASM     FileSys.NetFS.NetFS                     FileSys                 NetFS
@@ -309,7 +300,6 @@ MatrixKey               C       HWSupport.Input.MatrixKey               HWSuppor
 TSDriver                C       HWSupport.Input.TouchScreen.Driver      HWSupport               TouchScreen
 TSCalibrate             RES     HWSupport.Input.TouchScreen.Calibration HWSupport
 PCI                     ASM     HWSupport.PCI                           HWSupport               PCI
-PowerOff                ASM     HWSupport.PowerOff                      HWSupport               PowerOff
 VFPSupport              ASM     HWSupport.VFPSupport                    HWSupport               VFPSupport
 
 USBDriver               C       HWSupport.USB.NetBSD.build              USB                     USBDriver
@@ -317,17 +307,11 @@ OHCIDriver              C       HWSupport.USB.NetBSD.build              USB
 EHCIDriver              C       HWSupport.USB.NetBSD.build              USB                     EHCIDriver
 MUSBDriver              C       HWSupport.USB.Controllers.MUSBDriver    USB                     MUSBDriver
 OHCIHeaders             EXP     HWSupport.USB.Controllers.OHCIDriver    USB                     OHCIDriver
-PCIUSBDriver            C       HWSupport.USB.PCIUSB.PCIUSBDriver       USB                     PCIUSBDriver
-PCIOHCIDriver           C       HWSupport.USB.PCIUSB.PCIOHCIDriver      USB                     PCIOHCIDriver
 OHCIEmulator            C       HWSupport.USB.Controllers.OHCIEmulator  USB                     OHCIEm
 PHCIDriver              C       HWSupport.USB.Controllers.PHCIDriver    USB                     PHCIDriver
-USBKeyboard             C       HWSupport.USB.Drivers.USBKeyboard       USB                     USBKeyboard
-USBMouse                C       HWSupport.USB.Drivers.USBMouse          USB                     USBMouse
-USBPrinter              C       HWSupport.USB.Drivers.USBPrinter        USB                     USBPrinter
 PrototypeUSBComb        C       HWSupport.USB.Prototypes.ProtoUComb     USB                     ProtoUComb
 PrototypeUSBKey         C       HWSupport.USB.Prototypes.ProtoUKey      USB                     ProtoUKey
 PrototypeUSBMouse       C       HWSupport.USB.Prototypes.ProtoUMouse    USB                     ProtoUMouse
-PrototypeUSBHub         C       HWSupport.USB.ProtoUHub                 USB                     !USB
 
 Messages                ASM     Internat.Messages                       Internat                Messages
 MessagesHigh            ASM     Internat.Messages                       Internat                MessagesHI
@@ -387,8 +371,6 @@ Freeway                 C       Networking.AUN.Access.Freeway           Networki
 ShareFS                 C       Networking.AUN.Access.ShareFS.ShareFS   Networking              ShareFS
 MimeMap                 C       Networking.MimeMap                      Networking              MimeMap
 PPP                     C       Networking.Modem.PPP                    Networking              PPP
-PPPB                    C       Networking.Modem.PPPB                   Networking              PPP
-PPPCapture              C       Networking.Modem.PPPCapture             Networking              PPP
 CtrlsModem              C       Networking.Modem.CtrlsModem             Networking              CtrlsModem
 NetTime                 C       Networking.NetTime                      Networking              NetTime
 http                    C       Networking.HTTP                         Networking              http
@@ -480,7 +462,6 @@ MessageQueue            C       Programmer.MsgQueue                     Programm
 NCRegistry              C       Programmer.Registry.NCRegistry          Programmer              NCRegistry
 DebugButtn              ASM     Programmer.DebugButtn                   Programmer              DebugButtn
 KeyRecorder             ASM     Programmer.KeyRecorder                  Programmer              KeyRecorder
-IRQTest                 C       Programmer.IRQTest                      Programmer              IRQTest
 HeapUtils               ASM     Programmer.HeapUtils                    Programmer              HeapUtils
 SysLoad                 C       Programmer.SysLoad                      Programmer              SysLoad
 WatchAbort              C       Programmer.WatchAbort                   Programmer              WatchAbort
@@ -501,7 +482,6 @@ RMLoad2                 RES     SystemRes.STB.Utilities.RMLoad2         SystemRe
 RMRun2                  ASM     SystemRes.STB.Utilities.RMRun2          SystemRes               RMRun2
 PatchApp                C       SystemRes.Patch                         SystemRes               PatchApp
 ROMpatchU               C       SystemRes.Patch2                        SystemRes               ROMpatchU
-Imports                 RES     SystemRes.Imports                       SystemRes               Imports
 
 HeroNames               DATA    SystemRes.HeroNames                     RISC_OS                 HeroNames
 PartNumber              RES     SystemRes.PartNumber                    RISC_OS                 PartNumber
@@ -755,9 +735,6 @@ HForm                   BAS     Utilities.HForm                         Utilitie
 SaveCMOS                RES     Utilities.SaveCMOS                      Utilities               SaveCMOS
 ShowScrap               RES     Utilities.ShowScrap                     Utilities               ShowScrap
 Verify                  RES     Utilities.Verify                        Utilities               Verify
-AppSlot                 ASM     Utilities.BootUtils                     Utilities               AppSlot
-AddToRMA                ASM     Utilities.BootUtils                     Utilities               AddToRMA
-ShrinkRMA               ASM     Utilities.BootUtils                     Utilities               ShrinkRMA
 
 CallASWI                ASM     Utilities.Patches.CallASWI              Utilities               CallASWI
 PatchesANSILib          RES     Utilities.Patches.ansilib               Utilities               ansilib
@@ -778,7 +755,6 @@ PatchesTCPIP            RES     Utilities.Patches.TCP/IP                Utilitie
 # Component             Type    Source directory (in Sources)           Installation dir        Module filename
 #--------------------------------------------------------------------------------------------------------------
 
-Autobuild               RES     ^.Utilities.Autobuild.Autobuild         Autobuild               Autobuild
 ABRelease               RES     ^.Utilities.Autobuild.ABRelease         Autobuild               ABRelease
 
 #------------------------------------------------------------------------------------------------------------
diff --git a/VersionNum b/VersionNum
index d59fe19..09e31c4 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (5.07)
+/* (5.08)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        5.07
+#define Module_MajorVersion_CMHG        5.08
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                05 Dec 2010
+#define Module_Date_CMHG                16 Feb 2011
 
-#define Module_MajorVersion             "5.07"
-#define Module_Version                  507
+#define Module_MajorVersion             "5.08"
+#define Module_Version                  508
 #define Module_MinorVersion             ""
-#define Module_Date                     "05 Dec 2010"
+#define Module_Date                     "16 Feb 2011"
 
-#define Module_ApplicationDate          "05-Dec-10"
+#define Module_ApplicationDate          "16-Feb-11"
 
 #define Module_ComponentName            "BuildSys"
 #define Module_ComponentPath            "castle/RiscOS/BuildSys"
 
-#define Module_FullVersion              "5.07"
-#define Module_HelpVersion              "5.07 (05 Dec 2010)"
-#define Module_LibraryVersionInfo       "5:7"
+#define Module_FullVersion              "5.08"
+#define Module_HelpVersion              "5.08 (16 Feb 2011)"
+#define Module_LibraryVersionInfo       "5:8"
-- 
GitLab