Skip to content

GitLab

Commit bd87e411 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Add ability to override rom/standalone/install/export/debug/gpa rules in AasmModule 

Mirrors variables used in CModule. Note ${EXPORT} has changed to $CUSTOMEXP}, but nothing seemed to be using the former anyway.
ThemeDefs added to module database.
Replace useof ResApp with ThemeDefs in the disc image.


Version 5.77. Tagged as 'BuildSys-5_77'
parent d78383d7
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 25 deletions
Components/ROOL/Disc
View file @ bd87e411
......@@ -20,7 +20,6 @@ FileCore -type EXP # FileSys.FileCore
# Required for Hdr:SWIs (and swis.h) generation...
#
ADFS -type EXP # FileSys.ADFS.ADFS
###ARM3 -type EXP # HWSupport.ARM3
ATAPI -type EXP # HWSupport.CD.ATAPI
BASICTrans -type EXP # Programmer.BASICTrans
BufferManager -type EXP # HWSupport.Buffers
......@@ -135,7 +134,6 @@ USBDriver -type EXP # HWSupport.USB.NetBSD
#
# Working installed components...
#
###Imports -options INSTDIR=<Install$Dir>.HardDisc4
# Boot application
DesktopBoot -options INSTDIR=<Install$Dir>.HardDisc4 COMPONENT=Boot TARGET=UNIVERSAL
......@@ -150,11 +148,17 @@ InetSetup -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
Scrap -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
Unicode -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
Fonts -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources INSTFLAG=all
ResApp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
ResApp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources RESMOD=WimpPool
ResApp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources RESMOD=WindowTools
ResApp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources RESMOD=PaintPool
ResApp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources RESMOD=DrawPool
ThemeDefs -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
Paint -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Iyonix
Draw -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Iyonix
Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Iyonix
Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Sovereign
Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Morris4
Desktop -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Ursula
Wimp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Iyonix
Wimp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Sovereign
Wimp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Morris4
Wimp -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!ThemeDefs TARGET=ThemeDefs USERIF=Ursula
# System application
System -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
......@@ -187,7 +191,7 @@ SprBounce -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook
# Screen saver setup apps
AcornLogoSetup -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.ScrSavers.!AcornLogo
#CirclesSetup -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.ScrSavers.!Circles
###CirclesSetup -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.ScrSavers.!Circles
ScrBounceSetup -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.ScrSavers.!ScrBounce
ScrollingSetup -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.ScrSavers.!Scrolling
SliderSetup -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.ScrSavers.!Slider
......
Makefiles/AAsmModule
View file @ bd87e411
......@@ -114,10 +114,10 @@ CHEADER3 ?= _!_x_!_
#
# RISC OS ROM build rules:
#
rom: ${ROM_MODULE}
rom${CUSTOMROM}: ${ROM_MODULE}
@${ECHO} ${COMPONENT}: rom module built
install_rom: ${ROM_MODULE}
install_rom${CUSTOMROM}: ${ROM_MODULE}
${CP} ${ROM_MODULE} ${INSTDIR}.${TARGET} ${CPFLAGS}
@${ECHO} ${COMPONENT}: rom module installed
......@@ -136,7 +136,7 @@ ${ROM_OBJECT}: ${ROM_SOURCE} ${TOKHELPSRC} ${DIRS}
#
# Standalone builds
#
standalone: ${SA_MODULE}
standalone${CUSTOMSA}: ${SA_MODULE}
@${ECHO} ${COMPONENT}: standalone module built
${SA_MODULE}: ${SA_OBJECT} ${SA_LIBS} ${DIRS}
......@@ -157,13 +157,13 @@ ${MERGEDMSGS}${PRIVATEMSGS}:
IfThere LocalRes:CmdHelp Then ${TOKENCHECK} LocalRes:CmdHelp
IfThere LocalRes:CmdHelp Then ${CAT} LocalRes:CmdHelp { >> $@ }
install: ${SA_MODULE}
install${CUSTOMSA}: ${SA_MODULE}
${MKDIR} ${INSTDIR}
${CP} ${SA_MODULE} ${INSTDIR}.${TARGET} ${CPFLAGS}
${CHMOD} a=rx $@
@${ECHO} ${COMPONENT}: standalone module installed
debug: ${DBG_MODULE}
debug${CUSTOMDBG}: ${DBG_MODULE}
@${ECHO} ${COMPONENT}: standalone debug module built
${DBG_MODULE}: ${DBG_OBJECT} ${DBG_LIBS} ${DIRS}
......@@ -174,7 +174,7 @@ ${DBG_OBJECT}: ${ROM_SOURCE} ${MERGEDMSGS} ${TOKHELPSRC} ${DIRS}
${MKDIR} o.${MACHINE}
${AS} ${ASFLAGS} -o $@ ${ROM_SOURCE} ${SA_FLAGS} ${SA_DEBUG}
gpa_debug: ${GPA_FILE}
gpa_debug${CUSTOMGPA}: ${GPA_FILE}
@${ECHO} ${COMPONENT}: GPA debug listing generated
${GPA_FILE}: ${GPA_AIF}
......@@ -220,7 +220,7 @@ export_hdrs: ${EXPORTS}
export_libs:
@${ECHO} ${COMPONENT}: library export complete
export${EXPORT}: export_${PHASE}
export${CUSTOMEXP}: export_${PHASE}
@|
export_:: export_libs export_hdrs
......
ModuleDB
View file @ bd87e411
......@@ -740,6 +740,7 @@ SparkFS RES Sources.Apps.SparkFSBin
SquashApp C Sources.Apps.SquashApp Apps Squash
System RES Sources.SystemRes.System SystemRes System
T1ToFont C Sources.Printing.T1ToFont Printing T1ToFont
ThemeDefs RES Sources.SystemRes.ThemeDefs SystemRes ThemeDefs
Verify RES closed.RiscOS.Sources.Utilities.Verify Utilities Verify
#--------------------------------------------------------------------------------------------------------------------------------------
#
......
VersionNum
View file @ bd87e411
/* (5.76)
/* (5.77)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.76
#define Module_MajorVersion_CMHG 5.77
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 10 Aug 2012
#define Module_Date_CMHG 11 Aug 2012
#define Module_MajorVersion "5.76"
#define Module_Version 576
#define Module_MajorVersion "5.77"
#define Module_Version 577
#define Module_MinorVersion ""
#define Module_Date "10 Aug 2012"
#define Module_Date "11 Aug 2012"
#define Module_ApplicationDate "10-Aug-12"
#define Module_ApplicationDate "11-Aug-12"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "5.76"
#define Module_HelpVersion "5.76 (10 Aug 2012)"
#define Module_LibraryVersionInfo "5:76"
#define Module_FullVersion "5.77"
#define Module_HelpVersion "5.77 (11 Aug 2012)"
#define Module_LibraryVersionInfo "5:77"
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