Skip to content

GitLab

Commit 5ef9ae4d authored by Steve Revill's avatar Steve Revill
Browse files

Various updates generally associated with CTools builds. 

Components (ROOL CTools):
  * Added new components (ITable, BlendTable, RTC) for exports
  * Switch to using Install: rather than <Install$Dir> to help CLX
  * Replace CToolsCD component with DDE component
ModuleDB tweaks:
  * Added the (closed source) DDE resources component
  * Added a component for BuildSys itself (so DDE can get the Makefiles)
Shared makefile tweadded ERASECVS to the standard tools
  * Added a verbose copy flags CPVFLAGS for big copy operations
  * Added "install" rule for debug app builds (amu install INSTTYPE=debug)

Version 6.53. Tagged as 'BuildSys-6_53'
parent b4dd6974
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 124 deletions
Components/ROOL/CTools
View file @ 5ef9ae4d
......@@ -8,10 +8,13 @@
%Joiner BigSplit2
%JoinerFormat BigSplit
DDE -options INSTDIR=<Install$Dir>
BuildSys -options INSTDIR=Install:DDE.AcornC/C++ INSTTYPE=Makefiles
#
# Components only required for their headers
#
HdrSrc -options INSTDIR=<Install$Dir>.Intermediate.Tools.Libraries OPTIONS=ALL
HdrSrc -options INSTDIR=Install:DDE.AcornC/C++.Libraries OPTIONS=ALL
BufferManager -type EXP
ColourTrans -type EXP
FileSwitch -type EXP
......@@ -64,18 +67,22 @@ VCHIQ -type EXP
VFPSupport -type EXP
ZLibMod -type EXP
ITable -type EXP
BlendTable -type EXP
RTC -type EXP
#
# Libraries
#
SharedCLibrary -options INSTDIR=<Install$Dir>.Intermediate.Tools.Libraries INSTTYPE=libraries
SharedCLibrary -options INSTDIR=Install:DDE.AcornC/C++.Libraries INSTTYPE=libraries
TCPIPheaders -type EXP
inetlib -type EXP
rpclib -type EXP
socklib -type EXP
unixlib -type EXP
TCPIPheaders -options INSTDIR=<Install$Dir>.Intermediate.Tools.Libraries
AsmUtils -options INSTDIR=<Install$Dir>.Intermediate.Tools.Libraries
C++Lib -options INSTDIR=<Install$Dir>.Intermediate.Tools.Libraries
TCPIPheaders -options INSTDIR=Install:DDE.AcornC/C++.Libraries
AsmUtils -options INSTDIR=Install:DDE.AcornC/C++.Libraries
C++Lib -options INSTDIR=Install:DDE.AcornC/C++.Libraries
CLXLite -type EXP
CLX -type EXP
Common -type EXP
......@@ -85,7 +92,7 @@ ModMallocLib -type EXP
NBLib -type EXP
PDebug -type EXP
PlainArgvLib -type EXP
ToolboxLib -options INSTDIR=<Install$Dir>.Intermediate.Tools.Libraries
ToolboxLib -options INSTDIR=Install:DDE.AcornC/C++.Libraries
RemoteDebug -type EXP
Wild -type EXP
Trace -type EXP
......@@ -93,107 +100,122 @@ DebugLib -type EXP
tboxlib -type EXP
ConfigLib -type EXP
OSLib -type EXP
UnicodeLib -options INSTDIR=<Install$Dir>.Intermediate.Tools.Libraries
UnicodeLib -options INSTDIR=Install:DDE.AcornC/C++.Libraries
#
# Targets - DevSystem
#
System -options INSTDIR=<Install$Dir>.Intermediate.DevSystem
CallASWI -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules
SharedCLibrary -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules SCL_APCS="-APCS 3/26bit"
DDEUtils -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules
Debugger -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules
DragAnObj -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules
DragASprite -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules
DrawFile -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules INTERNATIONAL_HELP=NO
FilterManager -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules CMDHELP=None
FPEmulator -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules FPE_APCS=3/26bit MACHINE=RO310
FrontEnd -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules
Config2Installer -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules OPTIONS="-DNO_INTERNATIONAL_HELP"
ColourPicker -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules OPTIONS="-DNO_INTERNATIONAL_HELP"
RedrawManager -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules
TaskWindow -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules MACHINE=Archimedes CMDHELP=None
TinyStubs -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules
ColourDbox -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
ColourMenu -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
DCS_Quit -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox TARGET=DCS_Quit
FileInfo -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
FontDbox -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
FontMenu -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
Iconbar -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
Menu -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
PrintDbox -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
ProgInfo -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
SaveAs -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
Scale -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
ToolAction -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
Toolbox -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
Window -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.310.Modules.Toolbox
ddt -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.350.Modules INSTTYPE=tool
FPEmulator -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.350.Modules FPE_APCS=3/32bit MACHINE=RO350
TaskWindow -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.350.Modules CMDHELP=None
Config2Installer -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.360.Modules
FPEmulator -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.400.Modules FPE_APCS=3/32bit MACHINE=32
SharedCLibrary -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!System.500.Modules
System -options INSTDIR=Install:DDE.AcornC/C++.Developer
CallASWI -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules
SharedCLibrary -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules SCL_APCS="-APCS 3/26bit"
DDEUtils -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules
Debugger -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules
DragAnObj -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules
DragASprite -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules
DrawFile -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules INTERNATIONAL_HELP=NO
FilterManager -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules CMDHELP=None
FPEmulator -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules FPE_APCS=3/26bit MACHINE=RO310
FrontEnd -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules
Config2Installer -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules OPTIONS="-DNO_INTERNATIONAL_HELP"
ColourPicker -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules OPTIONS="-DNO_INTERNATIONAL_HELP"
RedrawManager -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules
TaskWindow -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules MACHINE=Archimedes CMDHELP=None
TinyStubs -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules
ColourDbox -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
ColourMenu -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
DCS_Quit -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox TARGET=DCS_Quit
FileInfo -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
FontDbox -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
FontMenu -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
Iconbar -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
Menu -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
PrintDbox -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
ProgInfo -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
SaveAs -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
Scale -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
ToolAction -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
Toolbox -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
Window -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.310.Modules.Toolbox
ddt -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.350.Modules INSTTYPE=tool
FPEmulator -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.350.Modules FPE_APCS=3/32bit MACHINE=RO350
TaskWindow -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.350.Modules CMDHELP=None
Config2Installer -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.360.Modules
FPEmulator -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.400.Modules FPE_APCS=3/32bit MACHINE=32
SharedCLibrary -options INSTDIR=Install:DDE.AcornC/C++.Developer.!System.500.Modules
#
# Targets - Library
#
a8time -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
amu -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
c++ -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
cc -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
cfront -options INSTDIR=<Install$Dir>.Intermediate.Library
cmhg -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
decaof -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
diff -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
find -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
libfile -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
link -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
modsqz -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
objasm -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
objsize -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
ResGen -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
squeeze -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
toansi -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
topcc -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
unmodsqz -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
xpand -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
BuildTools -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=DDE
a8time -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
amu -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
c++ -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
cc -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
cfront -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32
cmhg -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
decaof -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
diff -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
find -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
libfile -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
link -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
modsqz -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
objasm -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
objsize -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
ResGen -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
squeeze -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
toansi -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
topcc -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
unmodsqz -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
xpand -options INSTDIR=Install:DDE.AcornC/C++.!SetPaths.Lib32 INSTTYPE=tool
#
# Targets = Tools/EndUser
#
SharedCLibrary -options INSTDIR=<Install$Dir>.Intermediate.Tools.EndUser.!System.310.Modules SCL_APCS="-APCS 3/26bit"
SharedCLibrary -options INSTDIR=<Install$Dir>.Intermediate.Tools.EndUser.!System.500.Modules
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
ColourDbox -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
ColourMenu -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
DCS_Quit -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox TARGET=DCS_Quit
FileInfo -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
FontDbox -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
FontMenu -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
Iconbar -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
Menu -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
PrintDbox -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
ProgInfo -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
SaveAs -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
Scale -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
ToolAction -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
Toolbox -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
Window -options INSTDIR=Install:DDE.AcornC/C++.EndUser.!System.310.Modules.Toolbox
#
# Targets = Tools/Tools
#
a8time -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
amu -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
c++ -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
cc -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
cmhg -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
ddt -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
decaof -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
diff -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
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 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
ResCreate -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools
ResEd -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools
ResTest -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools
squeeze -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
SrcEdit -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools
toansi -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
topcc -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
unmodsqz -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
a8time -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
amu -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
c++ -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
cc -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
cmhg -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
ddt -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
decaof -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
diff -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
find -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
libfile -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
link -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
make -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
modsqz -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
objasm -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
objsize -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
ResCreate -options INSTDIR=Install:DDE.Apps.DDE
ResEd -options INSTDIR=Install:DDE.Apps.DDE
ResTest -options INSTDIR=Install:DDE.Apps.DDE
squeeze -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
SrcEdit -options INSTDIR=Install:DDE.Apps.DDE
toansi -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
topcc -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
unmodsqz -options INSTDIR=Install:DDE.Apps.DDE INSTTYPE=app
CToolsCD -options INSTDIR=<Install$Dir>.CToolsCD TARGET=!Instal_CC
ABRelease -options INSTDIR=<Install$Dir>.Intermediate.Tools
ABRelease -options INSTDIR=Install:DDE.Tools
# EOF
Makefiles/CApp
View file @ 5ef9ae4d
......@@ -27,26 +27,27 @@ INCLUDED_CAPP = YES
# This fragment uses the following macros set by the master makefile.
#
#
# COMPONENT (the name of the component)
# TARGET (opt) (the leafname of the application - otherwise ${COMPONENT})
# DBG_TARGET (opt) (debug application leafname - otherwise ${TARGET}-D)
# INSTAPP (opt) (the application target directory - otherwise ${INSTDIR}.!${COMPONENT})
# INSTDIR (opt) (the target directory - otherwise <Install$Dir>.${TARGET})
# DIRS (opt) (stamp object for directory creation - otherwise o._dirs)
# OBJS (opt) (object files, no o. prefixes - otherwise ${TARGET})
# APP_OBJS (opt) (release build object files, no prefixes - otherwise ${OBJS})
# DBG_OBJS (opt) (debug build object files, no prefixes - otherwise ${OBJS})
# LIBS (opt) (extra libraries; ${CLIB} is always used)
# APP_LIBS (opt) (extra release libraries - otherwise ${LIBS}; ${CLIB} is always used)
# DBG_LIBS (opt) (extra debug libraries - otherwise ${LIBS}; ${CLIB} and ${DEBUGLIBS} always used)
# LINK_TYPE (opt) (variant of linking command, eg C++ - defaults to C)
# INSTTYPE (opt) (use "tool" or "app" to install executable vs application - defaults to "tool")
# INSTAPP_FILES (opt) (list of files to be installed in application directory - use InstRes specification rules)
# INSTAPP_DEPENDS (opt) (list of dependencies to be satisfied before doing application install - ${TARGET} assumed if in INSTAPP_FILES)
# INSTAPP_VERSION (opt) (list of Messages/!Run/Desc files to insert app version from VersionNum - include in INSTAPP_FILES as well)
# CUSTOMLINK (opt) (set to "custom" to override the link rule)
# CUSTOMINSTALLAPP (opt) (set to "custom" to override the install rule for resource files)
# CUSTOMINSTALLTOOL (opt) (set to "custom" to override the install rule for target binary)
# COMPONENT (the name of the component)
# TARGET (opt) (the leafname of the application - otherwise ${COMPONENT})
# DBG_TARGET (opt) (debug application leafname - otherwise ${TARGET}-D)
# INSTAPP (opt) (the application target directory - otherwise ${INSTDIR}.!${COMPONENT})
# INSTDIR (opt) (the target directory - otherwise <Install$Dir>.${TARGET})
# DIRS (opt) (stamp object for directory creation - otherwise o._dirs)
# OBJS (opt) (object files, no o. prefixes - otherwise ${TARGET})
# APP_OBJS (opt) (release build object files, no prefixes - otherwise ${OBJS})
# DBG_OBJS (opt) (debug build object files, no prefixes - otherwise ${OBJS})
# LIBS (opt) (extra libraries; ${CLIB} is always used)
# APP_LIBS (opt) (extra release libraries - otherwise ${LIBS}; ${CLIB} is always used)
# DBG_LIBS (opt) (extra debug libraries - otherwise ${LIBS}; ${CLIB} and ${DEBUGLIBS} always used)
# LINK_TYPE (opt) (variant of linking command, eg C++ - defaults to C)
# INSTTYPE (opt) (use "tool" or "app" to install executable vs application - defaults to "tool")
# INSTAPP_FILES (opt) (list of files to be installed in application directory - use InstRes specification rules)
# INSTAPP_DEPENDS (opt) (list of dependencies to be satisfied before doing application install - ${TARGET} assumed if in INSTAPP_FILES)
# INSTAPP_VERSION (opt) (list of Messages/!Run/Desc files to insert app version from VersionNum - include in INSTAPP_FILES as well)
# CUSTOMLINK (opt) (set to "custom" to override the link rule)
# CUSTOMINSTALLAPP (opt) (set to "custom" to override the install rule for resource files)
# CUSTOMINSTALLTOOL (opt) (set to "custom" to override the install rule for target binary)
# CUSTOMINSTALLDBGAPP (opt) (set to "custom" to override the install rule for debug resources)
#
#
# It relies on the following generic tool macros from the StdTools makefile
......@@ -148,18 +149,22 @@ install_app${CUSTOMINSTALLAPP}: ${INSTAPP_DEPENDS}
ifneq (,$(filter Messages,${INSTAPP_VERSION}))
${CHMOD} +w ${INSTAPP}.Messages
${INSERTVERSION} LocalRes:Messages > ${INSTAPP}.Messages
endif
endif
ifneq (,$(filter Desc,${INSTAPP_VERSION}))
${CHMOD} +w ${INSTAPP}.Desc
${INSERTVERSION} descmode=1 LocalRes:Desc > ${INSTAPP}.Desc
endif
endif
ifneq (,$(filter !Run,${INSTAPP_VERSION}))
${CHMOD} +w ${INSTAPP}.!Run
${INSERTVERSION} obeymode=1 LocalRes:!Run > ${INSTAPP}.!Run
${SETTYPE} ${INSTAPP}.!Run Obey
endif
endif
@${ECHO} ${COMPONENT}: application installation complete
install_debug_app${CUSTOMINSTALLDBGAPP}: ${DBG_TARGET} install_app
${CP} ${DBG_TARGET} ${INSTAPP}.${TARGET} ${CPFLAGS}
@${ECHO} ${COMPONENT}: ${TARGET} replaced with ${DBG_TARGET}
install_tool${CUSTOMINSTALLTOOL}: ${TARGET}
${MKDIR} ${INSTDIR}
${CP} ${TARGET} ${INSTDIR}.${TARGET} ${CPFLAGS}
......
Makefiles/StdTools
View file @ 5ef9ae4d
......@@ -41,6 +41,7 @@ DATA2AOF = datatoaof
DEFMOD = defmod
DO = do
ECHO = echo
ERASECVS = EraseCVS
FAPPEND = FAppend
FILTERCOMP = ${PERL} Build:FilterComp
FILTERCOMP2 = ${PERL} Build:FilterComp2
......@@ -128,6 +129,7 @@ C_MODULE := -zM
# CPPREFLAGS go before the arguments
#
CPFLAGS = FR~C~V~N
CPVFLAGS = FR~CV~N
CPPREFLAGS =
CP = copy ${CPPREFLAGS}
......
ModuleDB
View file @ 5ef9ae4d
......@@ -81,6 +81,7 @@ zlibmodlib EXP Sources.Lib.zlib
#--------------------------------------------------------------------------------------------------------------------------------------
AutoDemo RES closed.RiscOS.Sources.Apps.AutoDemo
Boot RES closed.RiscOS.Sources.Apps.Boot
BuildSys RES BuildSys
PrintDefs RES Sources.Printing.PrintDefs
SoundRes RES closed.RiscOS.Sources.Audio.SoundRes
# Components inside SystemRes.STB.Baseline
......@@ -127,6 +128,7 @@ ResetPtr RES closed.RiscOS.Sources.SystemRes.STB.Utilities.
STBBootVar RES closed.RiscOS.Sources.SystemRes.STB.Utilities.BootVars
Unique RES closed.RiscOS.Sources.SystemRes.STB.Utilities.Unique
WhatSTB RES closed.RiscOS.Sources.SystemRes.STB.Utilities.WhatSTB
DDE RES Sources.SystemRes.DDE
#--------------------------------------------------------------------------------------------------------------------------------------
#
# Kernel is a special type for ensure it is at the top of the ROM
......
VersionNum
View file @ 5ef9ae4d
/* (6.52)
/* (6.53)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 6.52
#define Module_MajorVersion_CMHG 6.53
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 01 Oct 2014
#define Module_Date_CMHG 12 Oct 2014
#define Module_MajorVersion "6.52"
#define Module_Version 652
#define Module_MajorVersion "6.53"
#define Module_Version 653
#define Module_MinorVersion ""
#define Module_Date "01 Oct 2014"
#define Module_Date "12 Oct 2014"
#define Module_ApplicationDate "01-Oct-14"
#define Module_ApplicationDate "12-Oct-14"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "6.52"
#define Module_HelpVersion "6.52 (01 Oct 2014)"
#define Module_LibraryVersionInfo "6:52"
#define Module_FullVersion "6.53"
#define Module_HelpVersion "6.53 (12 Oct 2014)"
#define Module_LibraryVersionInfo "6:53"
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