Skip to content

GitLab

Commit 074b0ba2 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Branch RPiFreeze sync'd from BuildSys-6_11 

Version 6.00, 1.142.2.2. Tagged as 'BuildSys-6_00-1_142_2_2'
parent 5896adcf
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 49 deletions
Components/ROOL/BCM2835
View file @ 074b0ba2
......@@ -34,7 +34,6 @@ PCCardFS -type EXP
PDriver -type EXP
PDumperDM -type EXP
MakePSFont -type EXP
VCHIQ -type EXP
# kernel is first module in ROM seen as the UtilityModule
HAL_BCM2835
......@@ -47,11 +46,11 @@ TerritoryManager
Messages
MessageTrans
UK
#SerialKeyMouse
WindowManager -options OPTIONS=Ursula
TaskManager
# Desktop is the 11th module (default language)
Desktop
SharedRISC_OSLib
TaskManager
BASIC105
BASIC64
BASICTrans
......@@ -64,6 +63,7 @@ PortableHAL
RTSupport
USBDriver
DWCDriver
VCHIQ
BCMSound
BCMSupport
BCMVideo
......@@ -92,13 +92,13 @@ NetFS
NetFiler
NetPrint
NetStatus
NetUtils
Obey
Pinboard
PipeFS
RAMFSFiler
ResourceFiler
ROMFonts
#RTCAdjust
ScreenBlanker
ScrSaver -options SCRSAVERAPP=No
DualSerial
......@@ -156,7 +156,6 @@ Paint
Alarm
Chars
Help2
#RTCAdjust
#
# Toolbox Modules/Libs
......
Components/ROOL/Binaries
View file @ 074b0ba2
......@@ -77,13 +77,13 @@ NetFS -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Network
NetFiler -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Network
NetPrint -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Network
NetStatus -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Network
NetUtils -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Network
Obey -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Core
Pinboard -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Desktop
PipeFS -options INSTDIR=<Install$Dir>.HardDisc4.Modules.FileSys
RAMFSFiler -options INSTDIR=<Install$Dir>.HardDisc4.Modules.FileSys
ResourceFiler -options INSTDIR=<Install$Dir>.HardDisc4.Modules.FileSys
ROMFonts -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Core
RTCAdjust -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Core
ScreenBlanker -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Video
#ScrSaver -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Video SCRSAVERAPP=No
DualSerial -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Core
......@@ -125,7 +125,6 @@ Freeway -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Network
# LanManFS -options OPTIONS=-DCHECK_ARMBOOT_EXISTS ROMSPRITES=TRUE
# EtherK
DHCP -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Network
RTCAdjust -options INSTDIR=<Install$Dir>.HardDisc4.Modules.Core
# More libraries
tboxlib -type EXP
......
Components/ROOL/CTools
View file @ 074b0ba2
......@@ -28,6 +28,40 @@ TerritoryManager -type EXP
WindowManager -type EXP
Filer_Action -type EXP
FileCore -type EXP
ADFS -type EXP
ATAPI -type EXP
BASICTrans -type EXP
CDFS -type EXP
CDFSDriver -type EXP
DDT -type EXP
DeviceFS -type EXP
DMAManager -type EXP
DOSFS -type EXP
DrawMod -type EXP
Econet -type EXP
Free -type EXP
FSLock -type EXP
IIC -type EXP
Joystick -type EXP
ParallelDeviceDriver -type EXP
PCI -type EXP
PDumperPCL -type EXP
Podule -type EXP
PortableHAL -type EXP
RamFS -type EXP
ScreenBlanker -type EXP
ScreenModes -type EXP
SCSIDriver -type EXP
SCSIFS -type EXP
SDFS -type EXP
SDIODriver -type EXP
ShellCLI -type EXP
SoundDMA_HAL -type EXP
SuperSample -type EXP
VCHIQ -type EXP
ZLibMod -type EXP
#
# Libraries
#
......
Components/ROOL/Disc
View file @ 074b0ba2
......@@ -103,10 +103,10 @@ UnicodeLib -type EXP # Lib.Unicode
DeskLib -type EXP # Lib.Desk
ModMallocLib -type EXP # Lib.ModMalloc
###MemCheckLib -type EXP # Lib.MemCheck
ModuleTaskLib -type EXP # Lib.ModuleTask
#ModuleTaskLib -type EXP # Lib.ModuleTask
PlainArgvLib -type EXP # Lib.PlainArgv
RemoteDebug -type EXP # Lib.remotedb
AcornNCLib -type EXP # Lib.AcornNC
#AcornNCLib -type EXP # Lib.AcornNC
PDebug -type EXP # Lib.PDebug
DDTLib -type EXP # Lib.DDTLib
Wild -type EXP # Lib.Wild
......@@ -114,7 +114,7 @@ Trace -type EXP # Lib.Trace
DebugLib -type EXP # Lib.DebugLib
###C++Lib -type EXP # Lib.C++Lib
AsmUtils -type EXP # Lib.AsmUtils
HTMLLib -type EXP # Lib.HTML
#HTMLLib -type EXP # Lib.HTML
callx -type EXP # Lib.callx
zlib -type EXP # Lib.zlib
PRISMLib -type EXP # Lib.PRISMLib
......@@ -172,6 +172,7 @@ ArmBE -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
DDEUtils -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.310.Modules
JCompMod -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.310.Modules
RTSupport -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.500.Modules
NetI -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.310.Modules.Network CMDHELP=None
NetTime -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.360.Modules.Network
ScreenFX -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.360.Modules.Video
SharedCLibrary -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.500.Modules
......@@ -241,9 +242,6 @@ SCSIFiler -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO510Hook
EtherK -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.Configure.!InetSetup.AutoSense TARGET=AutoSense
EtherUSB -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.Configure.!InetSetup.AutoSense TARGET=AutoSense
# VCHIQ softload
VCHIQ -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO510Hook.Boot.PreDesk SOFTLOAD=TRUE
# Apps
Alarm -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO350Hook.Apps
Chars -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO350Hook.Apps
......
Components/ROOL/IOMD32
View file @ 074b0ba2
......@@ -35,7 +35,7 @@ PDumperDM -type EXP
MakePSFont -type EXP
VFPSupport -type EXP
# kernel is first module in ROM seen as the UtilityModule
# Kernel is first module in ROM seen as the UtilityModule
HAL_IOMD
Kernel -at 0xFC010000
Podule
......@@ -46,15 +46,13 @@ Messages
MessageTrans
UK
WindowManager -options OPTIONS=Ursula
# Desktop needs to be the 10th module (default language)
TaskManager
# Desktop is the 11th module (default language)
Desktop
SharedRISC_OSLib
VIDC20Video
Mouse
################### Portable needs to be taught about variable IOMD address
Portable -type EXP
PS2Driver
TaskManager
ADFSFiler
BASIC105
BASIC64
......@@ -64,10 +62,7 @@ ColourTrans
Debugger
DeviceFS
DisplayManager
################### Two ways to proceed with DMA: 1) write a HAL backed, or
################### 2) add build switch to force pre-HAL code to be used
################### (but this needs to be taught about variable IOMD address)
DMAManager -type EXP
DMAManager
DragASprite
DragAnObj
DrawMod
......@@ -81,7 +76,6 @@ FSLock
FontManager
FPEmulator -options FPE_APCS=3/32bit
Free
GameModes
Hourglass
IIC
International
......@@ -92,7 +86,6 @@ NetFS
NetFiler
NetPrint
NetStatus
NetUtils
Obey
ParallelDeviceDriver
Pinboard
......@@ -100,6 +93,7 @@ PipeFS
RAMFSFiler
ResourceFiler
ROMFonts
RTCAdjust
ScreenBlanker
ScrSaver -options SCRSAVERAPP=No
SerialDeviceDriver
......@@ -144,7 +138,6 @@ Paint
Alarm
Chars
Help2
RTCAdjust
#
# Toolbox Modules/Libs
......@@ -203,6 +196,7 @@ DebugLib
NVRAM -type EXP
PortManager -type EXP
Portable -type EXP
PCI -type EXP
SCSIFS -type EXP # Needed for header export, but depends on filecore headers
......
Components/ROOL/OMAP3
View file @ 074b0ba2
......@@ -35,7 +35,7 @@ PDriver -type EXP
PDumperDM -type EXP
MakePSFont -type EXP
# kernel is first module in ROM seen as the UtilityModule
# Kernel is first module in ROM seen as the UtilityModule
HAL_OMAP3
Kernel -at 0xFC018000
Podule -type EXP
......@@ -47,10 +47,11 @@ Messages
MessageTrans
UK
WindowManager -options OPTIONS=Ursula
TaskManager
# Desktop is the 11th module (default language)
Desktop
SharedRISC_OSLib
OMAPVideo -options CDEFINES="-DOMAP=3"
TaskManager
BASIC105
BASIC64
BASICTrans
......@@ -89,13 +90,13 @@ NetFS
NetFiler
NetPrint
NetStatus
NetUtils
Obey
Pinboard
PipeFS
RAMFSFiler
ResourceFiler
ROMFonts
#RTCAdjust
ScreenBlanker
ScrSaver -options SCRSAVERAPP=No
DualSerial
......@@ -151,7 +152,6 @@ Paint
Alarm
Chars
Help2
#RTCAdjust
#
# Toolbox Modules/Libs
......@@ -185,6 +185,7 @@ CDFSFiler
UnSqzAIF
PandoraKey
BatMgrHAL
InetRes -options TYPE=EmergencyUtils
# some libraries and bits
......
Components/ROOL/OMAP4
View file @ 074b0ba2
......@@ -34,7 +34,7 @@ PDriver -type EXP
PDumperDM -type EXP
MakePSFont -type EXP
# kernel is first module in ROM seen as the UtilityModule
# Kernel is first module in ROM seen as the UtilityModule
HAL_OMAP4
Kernel -at 0xFC010000
Podule -type EXP
......@@ -46,10 +46,11 @@ Messages
MessageTrans
UK
WindowManager -options OPTIONS=Ursula
TaskManager
# Desktop is the 11th module (default language)
Desktop
SharedRISC_OSLib
OMAPVideo -options CDEFINES="-DOMAP=4"
TaskManager
BASIC105
BASIC64
BASICTrans
......@@ -88,13 +89,13 @@ NetFS
NetFiler
NetPrint
NetStatus
NetUtils
Obey
Pinboard
PipeFS
RAMFSFiler
ResourceFiler
ROMFonts
#RTCAdjust
ScreenBlanker
ScrSaver -options SCRSAVERAPP=No
DualSerial
......@@ -150,7 +151,6 @@ Paint
Alarm
Chars
Help2
#RTCAdjust
#
# Toolbox Modules/Libs
......
Components/ROOL/S3C2440
View file @ 074b0ba2
......@@ -86,13 +86,13 @@ NetFS
NetFiler
NetPrint
NetStatus
NetUtils
Obey
Pinboard
PipeFS
RAMFSFiler
ResourceFiler
ROMFonts
#RTCAdjust
ScreenBlanker
ScrSaver -options SCRSAVERAPP=No
#DualSerial
......@@ -142,7 +142,6 @@ Paint
Alarm
Chars
Help2
#RTCAdjust
#
# Toolbox Modules/Libs
......
Components/ROOL/S3C6410
View file @ 074b0ba2
......@@ -86,13 +86,13 @@ NetFS
NetFiler
NetPrint
NetStatus
NetUtils
Obey
Pinboard
PipeFS
RAMFSFiler
ResourceFiler
ROMFonts
#RTCAdjust
ScreenBlanker
ScrSaver -options SCRSAVERAPP=No
#DualSerial
......@@ -142,7 +142,6 @@ Paint
Alarm
Chars
Help2
#RTCAdjust
#
# Toolbox Modules/Libs
......
Components/ROOL/Tungsten
View file @ 074b0ba2
......@@ -47,6 +47,7 @@ Messages
MessageTrans
UK
WindowManager -options OPTIONS=Ursula
# Desktop is the 11th module (default language)
Desktop
SharedRISC_OSLib
NVidia
......@@ -88,17 +89,17 @@ NetFS
NetFiler
NetPrint
NetStatus
NetUtils
Obey
Pinboard
PipeFS
RAMFSFiler
ResourceFiler
ROMFonts
RTCAdjust
ScreenBlanker
ScrSaver -options SCRSAVERAPP=No
DualSerial
SerialDeviceDriver
SerialDeviceDriver -options ASFLAGS="-PD \"PCIHardware SETL {TRUE}\""
SerialDeviceSupport
SerialMouse
ShellCLI
......@@ -146,7 +147,6 @@ Paint
Alarm
Chars
Help2
RTCAdjust
#
# Toolbox Modules/Libs
......
ImageName/SysMap
View file @ 074b0ba2
......@@ -37,9 +37,9 @@ Machine
5:STB55
C:STB5cx
F:Funai
I:IOMD
M:MPT
L:Lazarus
P:Phoebe
3:32
R:Morris
T:Tungsten
......
Makefiles/StdTools
View file @ 074b0ba2
......@@ -46,7 +46,7 @@ FILTERCOMP = ${PERL} Build:FilterComp
FILTERCOMP2 = ${PERL} Build:FilterComp2
GETVERSION = ${PERL} Build:GetVersion
HDR2H = ${PERL} Build:Hdr2H
INSTRES = <Perl$Dir>.perl Build:InstRes
INSTRES = <Perl$Dir>.perl Build:InstRes -v -v
ifeq (C++,${LINK_TYPE})
LD = link -c++
else
......@@ -56,11 +56,13 @@ MAKE = amu
MODGEN = modgen
MODSQZ = modsqz
NOP = @|
NUMBER = ${DO} RUN Build:Number
PERL = ${DO} <Perl$Dir>.perl
RESGEN = resgen
RM = remove
SETTYPE = settype
SQUASH = squash
SQUISH = squish
SQZ = squeeze
STRIPDEPEND = stripdepnd
TIDYDESC = ${PERL} Build:TidyDesc
......
ModuleDB
View file @ 074b0ba2
......@@ -161,6 +161,7 @@ BASIC105 ASM Sources.Programmer.BASIC
BASIC64 ASM Sources.Programmer.BASIC Programmer BASIC64
BASICTrans ASM Sources.Programmer.BASICTrans Programmer BASICTrans
BatMgr ASM Sources.HWSupport.BatMgr HWSupport BatMgr
BatMgrHAL C Sources.HWSupport.BatMgrHAL HWSupport BatMgr
BBCEconet ASM Sources.Networking.BBCEconet Networking BBCEconet
BCMSound ASM Sources.HWSupport.Sound.BCMSound HWSupport BCMSound
BCMSupport C Sources.HWSupport.BCMSupport HWSupport BCMSupport
......@@ -356,6 +357,7 @@ NCRegistry C closed.RiscOS.Sources.Programmer.Registry.NCRe
NCUpgrade C closed.RiscOS.Sources.Apps.NCUpgrade Apps NCUpgrade
NCWriter C closed.RiscOS.Sources.Apps.NCWriter Apps NCWriter
Net C Sources.Networking.AUN.Net Networking Net
NetI C Sources.Networking.AUN.Net Networking NetI
NetFiler ASM Sources.FileSys.NetFS.NetFiler FileSys NetFiler
NetFS ASM Sources.FileSys.NetFS.NetFS FileSys NetFS
NetPrint ASM Sources.FileSys.NetPrint FileSys NetPrint
......
VersionNum
View file @ 074b0ba2
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 6.00
#define Module_MinorVersion_CMHG 1.142.2.1
#define Module_Date_CMHG 08 Oct 2012
#define Module_MinorVersion_CMHG 1.142.2.2
#define Module_Date_CMHG 07 Mar 2013
#define Module_MajorVersion "6.00"
#define Module_Version 600
#define Module_MinorVersion "1.142.2.1"
#define Module_Date "08 Oct 2012"
#define Module_MinorVersion "1.142.2.2"
#define Module_Date "07 Mar 2013"
#define Module_ApplicationDate "08-Oct-12"
#define Module_ApplicationDate "07-Mar-13"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "6.00 (1.142.2.1)"
#define Module_HelpVersion "6.00 (08 Oct 2012) 1.142.2.1"
#define Module_FullVersion "6.00 (1.142.2.2)"
#define Module_HelpVersion "6.00 (07 Mar 2013) 1.142.2.2"
#define Module_LibraryVersionInfo "6:0"
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