Skip to content

GitLab

Commit 773ab6e8 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Merge of trunch BuildSys-6_19 to branch RPiFreeze 

Version 6.00, 1.142.2.3. Tagged as 'BuildSys-6_00-1_142_2_3'
parent 074b0ba2
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 26 deletions
Components/ROOL/BCM2835
View file @ 773ab6e8
......@@ -65,7 +65,6 @@ USBDriver
DWCDriver
VCHIQ
BCMSound
BCMSupport
BCMVideo
DisplayManager
DMAManager
......
Components/ROOL/CTools
View file @ 773ab6e8
......@@ -41,6 +41,7 @@ DOSFS -type EXP
DrawMod -type EXP
Econet -type EXP
Free -type EXP
Freeway -type EXP
FSLock -type EXP
IIC -type EXP
Joystick -type EXP
......@@ -50,6 +51,7 @@ PDumperPCL -type EXP
Podule -type EXP
PortableHAL -type EXP
RamFS -type EXP
RemotePrinterSupport -type EXP
ScreenBlanker -type EXP
ScreenModes -type EXP
SCSIDriver -type EXP
......
Components/ROOL/Disc
View file @ 773ab6e8
......@@ -43,6 +43,7 @@ FilterManager -type EXP # Desktop.Filter
FontManager -type EXP # Video.Render.Fonts.Manager
FPEmulator -type EXP # HWSupport.FPASC.riscos
Free -type EXP # Desktop.Free
Freeway -type EXP # Networking.AUN.Access.Freeway
FSLock -type EXP # FileSys.FSLock
HostFS -type EXP # Programmer.HostFS
Hourglass -type EXP # Video.Render.Hourglass
......@@ -51,6 +52,7 @@ PortManager -type EXP # HWSupport.PortMan
Joystick -type EXP # HWSupport.Joystick
MakePSFont -type EXP # Printing.Modules.MakePSFont <- also included as installed component
MessageTrans -type EXP # Internat.MsgTrans
NetPrint -type EXP # FileSys.NetPrint
ParallelDeviceDriver -type EXP # HWSupport.Parallel
PCI -type EXP # HWSupport.PCI
PDriver -type EXP # Printing.Modules.PDriver <- also included as installed component
......@@ -60,10 +62,12 @@ PDumperSpt -type EXP # Printing.Modules.PDumperSpt <- also
Podule -type EXP # HWSupport.Podule
Portable -type EXP # HWSupport.Portable
RamFS -type EXP # FileSys.RAMFS.RAMFS
RemotePrinterSupport -type EXP # Printing.Modules.RemPrnSpt
ResourceFS -type EXP # FileSys.ResourceFS.ResourceFS
ScreenBlanker -type EXP # Video.Render.ScrBlank
ScreenModes -type EXP # Video.UserI.ScrModes
SCSIDriver -type EXP # HWSupport.SCSI.SCSIDriver
SDFS -type EXP # FileSys.SDFS.SDFS
ShellCLI -type EXP # Desktop.ShellCLI
SoundDMA -type EXP # HWSupport.Sound.Sound0
SoundChannels -type EXP # HWSupport.Sound.Sound1
......@@ -159,6 +163,7 @@ Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs.Themes TARGET=ThemeDefs USERIF=Sovereign
Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs.Themes TARGET=ThemeDefs USERIF=Morris4
Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs.Themes TARGET=ThemeDefs USERIF=Ursula
Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs.Themes TARGET=ThemeDefs USERIF=Raspberry
WindowManager -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs.Themes TARGET=ThemeDefs USERIF=Iyonix
WindowManager -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs.Themes TARGET=ThemeDefs USERIF=Sovereign
WindowManager -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs.Themes TARGET=ThemeDefs USERIF=Morris4
......@@ -295,7 +300,7 @@ MaestroFiles -options INSTDIR=<Install$Dir>.HardDisc4.Documents.Music
# Utilities
HForm -options INSTDIR=<Install$Dir>.HardDisc4.Utilities.Caution
DesktopBoot -options INSTDIR=<Install$Dir>.HardDisc4.Utilities.Caution TARGET= COMPONENT=ResetBoot
PatchesPatch -options INSTDIR=<Install$Dir>.HardDisc4.Utilities.500.Patches
PatchesPatch -options INSTDIR=<Install$Dir>.HardDisc4.Utilities
ShowScrap -options INSTDIR=<Install$Dir>.HardDisc4.Utilities
Usage -options INSTDIR=<Install$Dir>.HardDisc4.Utilities
T1ToFont -options INSTDIR=<Install$Dir>.HardDisc4.Utilities
......
Components/ROOL/OMAP3
View file @ 773ab6e8
......@@ -129,7 +129,6 @@ SCSIFiler -options ASFLAGS="-PD \"SCSI SETL {TRUE}\"" TEMPLATES=yes
SDIODriver
SDFS
SDFSFiler -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes
SDCMOS
ColourPicker
ScreenModes
DrawFile
......
Components/ROOL/OMAP4
View file @ 773ab6e8
......@@ -128,7 +128,6 @@ SCSIFiler -options ASFLAGS="-PD \"SCSI SETL {TRUE}\"" TEMPLATES=yes
SDIODriver
SDFS
SDFSFiler -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes
#SDCMOS
ColourPicker
ScreenModes
DrawFile
......
Components/ROOL/PlingSystem
View file @ 773ab6e8
......@@ -45,8 +45,9 @@ Free -type EXP
FSLock -type EXP
HostFS -type EXP
Hourglass -type EXP
IIC -type EXP
PortManager -type EXP
IIC -type EXP
International -type EXP
PortManager -type EXP
Joystick -type EXP
MessageTrans -type EXP
ParallelDeviceDriver -type EXP
......@@ -68,7 +69,7 @@ SuperSample -type EXP
TaskManager -type EXP
TaskWindow -type EXP
TerritoryManager -type EXP
WindowManager -type EXP
VFPSupport -type EXP
#
# RISC_OSLib, or the Shared C Library...
......@@ -106,8 +107,7 @@ SharedCLibrary -options INSTDIR=<Install$Dir>.System.!System.310.Module
Config2Installer -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None
Config2Installer -options INSTDIR=<Install$Dir>.System.!System.360.Modules
BootCommands -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None
BootCommands -options INSTDIR=<Install$Dir>.System.!System.360.Modules
TaskWindow -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None
TaskWindow -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None
TinyStubs -options INSTDIR=<Install$Dir>.System.!System.310.Modules
FilterManager -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None
FrontEnd -options INSTDIR=<Install$Dir>.System.!System.310.Modules
......@@ -116,6 +116,11 @@ DrawFile -options INSTDIR=<Install$Dir>.System.!System.310.Module
ITable -options INSTDIR=<Install$Dir>.System.!System.350.Modules
UnSqzAIF -options INSTDIR=<Install$Dir>.System.!System.370.Modules
PatchApp -options INSTDIR=<Install$Dir>.System.!System.370.Modules
WindowManager -options INSTDIR=<Install$Dir>.System.!System.310.Modules OPTIONS=RO310
WindowManager -options INSTDIR=<Install$Dir>.System.!System.350.Modules OPTIONS=RO350
WindowManager -options INSTDIR=<Install$Dir>.System.!System.360.Modules OPTIONS=RO360
WindowManager -options INSTDIR=<Install$Dir>.System.!System.370.Modules OPTIONS=RO370
WindowManager -options INSTDIR=<Install$Dir>.System.!System.400.Modules OPTIONS=RO400 USERIF=Ursula
#
# 26/32 neutral
......
Components/ROOL/Printers
View file @ 773ab6e8
......@@ -9,16 +9,16 @@
%JoinerFormat BigSplit
%sigstr Univ
# Working installed components...
#
# Bits used in compilation
DummyParallel -options INSTDIR=<Build$Dir>.Modules.Testing
DummyEconet -options INSTDIR=<Build$Dir>.Modules.Testing
NetPrint -options INSTDIR=<Build$Dir>.Modules
PDriver -options INSTDIR=<Build$Dir>.Modules
RemotePrinterSupport -options INSTDIR=<Build$Dir>.Modules
# Required for Hdr:SWIs (and swis.h) generation...
Freeway -type EXP
Econet -type EXP
ParallelDeviceDriver -type EXP
NetPrint -type EXP
PDriver -type EXP
MakePSFont -type EXP
RemotePrinterSupport -type EXP
# bits actually required
# Bits actually required
FontPrint -options INSTDIR=<Install$Dir>.HardDisc4.Printing
PrintEdit -options INSTDIR=<Install$Dir>.HardDisc4.Printing
PrintDefs -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
......
Makefiles/StdTools
View file @ 773ab6e8
......@@ -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 -v -v
INSTRES = <Perl$Dir>.perl Build:InstRes
ifeq (C++,${LINK_TYPE})
LD = link -c++
else
......
VersionNum
View file @ 773ab6e8
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 6.00
#define Module_MinorVersion_CMHG 1.142.2.2
#define Module_Date_CMHG 07 Mar 2013
#define Module_MinorVersion_CMHG 1.142.2.3
#define Module_Date_CMHG 08 Jul 2013
#define Module_MajorVersion "6.00"
#define Module_Version 600
#define Module_MinorVersion "1.142.2.2"
#define Module_Date "07 Mar 2013"
#define Module_MinorVersion "1.142.2.3"
#define Module_Date "08 Jul 2013"
#define Module_ApplicationDate "07-Mar-13"
#define Module_ApplicationDate "08-Jul-13"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "6.00 (1.142.2.2)"
#define Module_HelpVersion "6.00 (07 Mar 2013) 1.142.2.2"
#define Module_FullVersion "6.00 (1.142.2.3)"
#define Module_HelpVersion "6.00 (08 Jul 2013) 1.142.2.3"
#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