Skip to content

GitLab

Commit 8ee8d5f2 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Add Allocate to the ModuleDB 

Add Allocate, for CTools components file.
Move !MakeModes out of the ROM modules section into the disc apps section.
Temporarily remove ATAPI from Titanium so the build completes without error.

Version 6.80. Tagged as 'BuildSys-6_80'
parent 38cc10c9
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 17 deletions
Components/ROOL/CTools
View file @ 8ee8d5f2
......@@ -172,7 +172,7 @@ unmodsqz -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32
xpand -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
#
# Targets = Tools/EndUser
# Targets - Tools/EndUser
#
SharedCLibrary -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules SCL_APCS="-APCS 3/26bit"
SharedCLibrary -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.500.Modules
......@@ -194,7 +194,12 @@ Toolbox -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.
Window -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
#
# Targets = Tools/Tools
# Targets - Utilities
#
Allocate -options INSTDIR=Install:DDE.Utilities
#
# Targets - Tools/Tools
#
a8time -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
amu -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
......
Components/ROOL/Titanium
View file @ 8ee8d5f2
......@@ -175,7 +175,7 @@ Gadgets
# CDFS
#
CDFSDriver
ATAPI
ATAPI -type EXP
CDFSSoftSCSI
CDFS
CDFSFiler
......
ModuleDB
View file @ 8ee8d5f2
......@@ -340,7 +340,6 @@ LDAP C closed.RiscOS.Sources.Networking.Fetchers.LDAP
LED C closed.RiscOS.Sources.HWSupport.LED HWSupport LED
LoadWimp RES Sources.SystemRes.LoadWimp RISC_OS LoadWimp
LocaleRes RES closed.RiscOS.Sources.SystemRes.STB.Utilities.LocaleRes SystemRes LocaleRes
MakeModes C Sources.Apps.MakeModes Apps MakeModes
MakePSFont C Sources.Printing.Modules.MakePSFont Printing MakePSFont
MatrixKey C closed.RiscOS.Sources.HWSupport.Input.MatrixKey HWSupport MatrixKey
MatrixKeyboard C closed.RiscOS.Sources.HWSupport.Input.MatrixKey HWSupport MatrixKey
......@@ -608,11 +607,9 @@ ZLibMod C Sources.Programmer.ZLibMod
#--------------------------------------------------------------------------------------------------------------------------------------
#
# These are the tools - they do not build ROM targets, but installable disc targets.
# NOTE: The since the tool sources are in RiscOS/Tools, we need to use the parent directory
# specifier to get at the correct directories.
#
#--------------------------------------------------------------------------------------------------------------------------------------
# Component Type Source directory (in Sources) Installation dir Module filename
# Component Type Source directory Inst dir Module filename
#--------------------------------------------------------------------------------------------------------------------------------------
a8time C Tools.Sources.a8time Tools a8time
amu C Tools.Sources.amu Tools amu
......@@ -706,6 +703,7 @@ CDReinit ASM Sources.SystemRes.DesktopBoot.Source.CDReinit
DPMSUtils ASM Sources.SystemRes.DesktopBoot.Source.DPMSUtils SystemRes DPMSUtils
WimpUtils ASM Sources.SystemRes.DesktopBoot.Source.WimpUtils SystemRes WimpUtils
Alarm BAS Sources.Apps.Alarm Apps Alarm
Allocate C Sources.Utilities.Allocate Utilities Allocate
AREncode C closed.RiscOS.Sources.Apps.AREncode Apps AREncode
ARMovie RES closed.RiscOS.Sources.SystemRes.ARMovie SystemRes ARMovie
ARPlayer C closed.RiscOS.Sources.Apps.ARPlayer Apps ARPlayer
......@@ -749,6 +747,7 @@ InetSetup C Sources.SystemRes.InetSetup
Madness BAS Sources.Apps.Diversions.Madness Apps Madness
Maestro BAS Sources.Apps.Maestro Apps Maestro
MaestroFiles RES Sources.Apps.Maestro
MakeModes C Sources.Apps.MakeModes Apps MakeModes
MchConfig C closed.RiscOS.Sources.SystemRes.MchConfig SystemRes MchConfig
MemNow BAS Sources.Apps.Diversions.MemNow Apps MemNow
Meteors C Sources.Apps.Diversions.Meteors Apps Meteors
......
VersionNum
View file @ 8ee8d5f2
/* (6.79)
/* (6.80)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 6.79
#define Module_MajorVersion_CMHG 6.80
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 08 Nov 2015
#define Module_Date_CMHG 14 Nov 2015
#define Module_MajorVersion "6.79"
#define Module_Version 679
#define Module_MajorVersion "6.80"
#define Module_Version 680
#define Module_MinorVersion ""
#define Module_Date "08 Nov 2015"
#define Module_Date "14 Nov 2015"
#define Module_ApplicationDate "08-Nov-15"
#define Module_ApplicationDate "14-Nov-15"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "6.79"
#define Module_HelpVersion "6.79 (08 Nov 2015)"
#define Module_LibraryVersionInfo "6:79"
#define Module_FullVersion "6.80"
#define Module_HelpVersion "6.80 (14 Nov 2015)"
#define Module_LibraryVersionInfo "6:80"
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