Skip to content

GitLab

Commit 6549cd98 authored by Ben Avison's avatar Ben Avison
Browse files

Major overhaul 

Detail:
  Removed the following modules since they can be built from source:
    310.Modules: BASIC64, Colours, FrontEnd, Network.URL.*, SCSIFiler
    370.Modules: DDT (and it should go in 350.Modules)
    abs: DDT, FrontEnd (ancient Absolute versions, unused in build)
  Removed the following third-party modules:
    310.Modules: ABIMod, SSound
  Added the following from the C/C++ tools CD !System:
    310.Modules: 310Support.*, BorderUtil
  Updated !Run and !Help from the C/C++ tools CD !System
  Moved sprites to Iyonix subdirectory, added Morris4, Ursula and RO400
  versions of the sprites (the appropriate set is selected at build time
  depending upon the UserIF build variable)
Admin:
  Tested in Tools CD build.

Version 0.05. Tagged as 'System-0_05'
parent 36d7eaa8
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 134 deletions
Makefile
View file @ 6549cd98
......@@ -37,80 +37,40 @@
# 04-Oct-99 SNB Removed dependency on Support lib.
# 22-Nov-99 SNB Removed DDEUtils: now in RiscOS/Sources/Programmer/DDEUtils
EXP_HDR = <export$dir>
#
# Program specific options:
#
COMPONENT = System
APP = !${COMPONENT}
RDIR = Resources
LDIR = ${RDIR}.${LOCALE}
INSTAPP = ${INSTDIR}.${APP}
# Generic options:
#
MKDIR = do mkdir -p
AS = objasm
ATTR = -Attr
CC = cc
CMHG = cmhg
CHMOD = chmod
CP = copy
LD = link
RM = remove
SQUEEZE = squeeze
WIPE = -wipe
AFLAGS = ${THROWBACK} -depend !Depend -nocache -stamp -quit
CFLAGS = ${THROWBACK} -c -depend !Depend -ffah ${INCLUDES} ${DFLAGS} -wp
CPFLAGS = ~cfr~v
SQFLAGS = -f
WFLAGS = ~c~v
#
# Libraries
#
CLIB = CLib:o.Stubs
#
# Include files
#
INCLUDES = -IC:,C:RMVersion
MODULES = \
310.Modules.ABCLib \
310.Modules.ABIMod \
310.Modules.BASIC64 \
310.Modules.Colours \
310.Modules.DDT \
310.Modules.FrontEnd \
310.Modules.Network.URL.File \
310.Modules.Network.URL.URL \
310.Modules.SCSIFiler \
310.Modules.SerialUtil \
370.Modules.DDT
FILES =\
${LDIR}.!Boot\
${LDIR}.!Help\
${RDIR}.!Run\
${RDIR}.!Sprites\
${RDIR}.!Sprites22\
${RDIR}.SysPaths
LIBS = C:RMVersion.o.RMVersion
MODULES = \
310.Modules.310Support.icons \
310.Modules.310Support.icons22 \
310.Modules.310Support.ThreeTen \
310.Modules.ABCLib \
310.Modules.BorderUtil \
310.Modules.DDT \
310.Modules.SerialUtil \
#
# Rule patterns
#
.SUFFIXES: .oz .od .asm .s
.c.o:; ${CC} ${CFLAGS} -ff -o $@ $<
.s.o:; ${AS} ${AFLAGS} $< $@
.s.od:; ${AS} ${AFLAGS} -g $< $@
.c.oz:; ${CC} ${CFLAGS} -ff -zM -zps1 -o $@ $<
.c.od:; ${CC} ${CFLAGS} -DTRACE=1 -g -o $@ $<
.asm.o:; ${AS} ${AFLAGS} $< $@
.asm.od:; ${AS} ${AFLAGS} -g $< $@
FILES = \
LocalRes:!Boot \
LocalRes:!Help \
${RDIR}.!Run \
LocalUserIFRes:!Sprites \
${RDIR}.SysPaths \
#
# Main rules:
......@@ -120,91 +80,30 @@ all: ${FILES}
install: ${FILES}
${MKDIR} ${INSTAPP}
${CP} ${LDIR}.!Boot ${INSTAPP}.!Boot ${CPFLAGS}
${CP} ${LDIR}.!Help ${INSTAPP}.!Help ${CPFLAGS}
${CP} ${RDIR}.!Run ${INSTAPP}.!Run ${CPFLAGS}
${CP} ${RDIR}.!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
${CP} ${RDIR}.SysPaths ${INSTAPP}.SysPaths ${CPFLAGS}
${CP} LocalRes:!Boot ${INSTAPP}.!Boot ${CPFLAGS}
${CP} LocalRes:!Help ${INSTAPP}.!Help ${CPFLAGS}
${CP} ${RDIR}.!Run ${INSTAPP}.!Run ${CPFLAGS}
${CP} LocalUserIFRes:!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
IfThere LocalUserIFRes:!Sprites11 then ${CP} LocalUserIFRes:!Sprites11 ${INSTAPP}.!Sprites11 ${CPFLAGS}
IfThere LocalUserIFRes:!Sprites22 then ${CP} LocalUserIFRes:!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
${CP} ${RDIR}.SysPaths ${INSTAPP}.SysPaths ${CPFLAGS}
|
${MKDIR} ${INSTAPP}.Modules
${MKDIR} ${INSTAPP}.310.Modules
${MKDIR} ${INSTAPP}.310.Modules.Network.URL
${MKDIR} ${INSTAPP}.350.Modules
${MKDIR} ${INSTAPP}.360.Modules
${MKDIR} ${INSTAPP}.370.Modules
${MKDIR} ${INSTAPP}.400.Modules
${MKDIR} ${INSTAPP}.500.Modules
${MKDIR} ${INSTAPP}.310.Modules.310Support
|
${CP} 310.Modules.ABCLib ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.ABIMod ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.BASIC64 ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.Colours ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.DDT ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.FrontEnd ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.SCSIFiler ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.SerialUtil ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.Network.URL.File ${INSTAPP}.310.Modules.Network.URL.* ${CPFLAGS}
${CP} 310.Modules.Network.URL.URL ${INSTAPP}.310.Modules.Network.URL.* ${CPFLAGS}
${CP} 310.Modules.SSound ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 370.Modules.DDT ${INSTAPP}.370.Modules.* ${CPFLAGS}
${CP} 310.Modules.310Support.icons ${INSTAPP}.310.Modules.310Support.* ${CPFLAGS}
${CP} 310.Modules.310Support.icons22 ${INSTAPP}.310.Modules.310Support.* ${CPFLAGS}
${CP} 310.Modules.310Support.ThreeTen ${INSTAPP}.310.Modules.310Support.* ${CPFLAGS}
${CP} 310.Modules.ABCLib ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.BorderUtil ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.DDT ${INSTAPP}.310.Modules.* ${CPFLAGS}
${CP} 310.Modules.SerialUtil ${INSTAPP}.310.Modules.* ${CPFLAGS}
|
${ATTR} -directories +wr ${INSTAPP}
${ATTR} -files +ol +or -ow +wr -ww ${INSTAPP}
${ATTR} -files -ol +or +ow +wr -ww ${INSTAPP}.Modules
${ATTR} -files -ol +or +ow +wr -ww ${INSTAPP}.310
${ATTR} -files -ol +or +ow +wr -ww ${INSTAPP}.350
${ATTR} -files -ol +or +ow +wr -ww ${INSTAPP}.360
${ATTR} -files -ol +or +ow +wr -ww ${INSTAPP}.370
${ATTR} -files -ol +or +ow +wr -ww ${INSTAPP}.400
${ATTR} -files -ol +or +ow +wr -ww ${INSTAPP}.500
${CHMOD} -R 755 ${INSTAPP}
|
@echo ${COMPONENT}: All installed (Disc)
clean:
${WIPE} o.* ${WFLAGS}
${WIPE} oz.* ${WFLAGS}
${WIPE} od.* ${WFLAGS}
@echo ${COMPONENT}: cleaned
clean_all: clean
IfThere ${INSTAPP} Then Access ${INSTAPP} rw/
IfThere ${INSTAPP}.* Then Access ${INSTAPP}.* rw/
IfThere ${INSTAPP}.200.Modules Then Access ${INSTAPP}.200.Modules rw/
IfThere ${INSTAPP}.200.Modules.* Then Access ${INSTAPP}.200.Modules.* rw/
IfThere ${INSTAPP}.300.Modules Then Access ${INSTAPP}.300.Modules rw/
IfThere ${INSTAPP}.300.Modules.* Then Access ${INSTAPP}.300.Modules.* rw/
IfThere ${INSTAPP}.310.Modules Then Access ${INSTAPP}.310.Modules rw/
IfThere ${INSTAPP}.310.Modules.* Then Access ${INSTAPP}.310.Modules.* rw/
IfThere ${INSTAPP}.350.Modules Then Access ${INSTAPP}.350.Modules rw/
IfThere ${INSTAPP}.350.Modules.* Then Access ${INSTAPP}.350.Modules.* rw/
IfThere ${INSTAPP}.360.Modules Then Access ${INSTAPP}.360.Modules rw/
IfThere ${INSTAPP}.360.Modules.* Then Access ${INSTAPP}.360.Modules.* rw/
IfThere ${INSTAPP}.370.Modules Then Access ${INSTAPP}.370.Modules rw/
IfThere ${INSTAPP}.370.Modules.* Then Access ${INSTAPP}.370.Modules.* rw/
IfThere ${INSTAPP}.400.Modules Then Access ${INSTAPP}.400.Modules rw/
IfThere ${INSTAPP}.400.Modules.* Then Access ${INSTAPP}.400.Modules.* rw/
IfThere ${INSTAPP}.500.Modules Then Access ${INSTAPP}.500.Modules rw/
IfThere ${INSTAPP}.500.Modules.* Then Access ${INSTAPP}.500.Modules.* rw/
-Destroy ${OBJS} ${OBJSD} abs.SysPaths ${INSTAPP}.!Boot \
${INSTAPP}.!Help ${INSTAPP}.!Run ${INSTAPP}.!Sprites \
${INSTAPP}.!Sprites22 ${INSTAPP}.SysPaths
${WIPE} ${INSTAPP}.200 ${WFLAGS}R
${WIPE} ${INSTAPP}.300 ${WFLAGS}R
${WIPE} ${INSTAPP}.310 ${WFLAGS}R
${WIPE} ${INSTAPP}.350 ${WFLAGS}R
${WIPE} ${INSTAPP}.360 ${WFLAGS}R
${WIPE} ${INSTAPP}.370 ${WFLAGS}R
${WIPE} ${INSTAPP}.400 ${WFLAGS}R
${WIPE} ${INSTAPP}.500 ${WFLAGS}R
@echo ${COMPONENT}: cleaned (all)
export: ${EXPORTS}
@echo ${COMPONENT}: export complete
#
# Static dependencies:
#
#---------------------------------------------------------------------------
# Dynamic dependencies:
Resources/!Run,feb
View file @ 6549cd98
| !Run file for !System, version 0.82 (25-Sep-02)
| !Run file for !System, version 0.83 (23-Jan-03)
|
IconSprites <Obey$Dir>.!Sprites
WimpSlot 20k 20k
Set System$Dir <Obey$Dir>
/<System$Dir>.SysPaths
If Boot$OSVersion >= 310 Then RMEnsure UtilityModule 3.70 RMEnsure CallASWI 0.02 RMLoad System:Modules.CallASWI
If Boot$OSVersion >= 310 Then RMEnsure UtilityModule 5.00 RMEnsure CallASWI 0.03 RMLoad System:Modules.CallASWI
If Boot$OSVersion >= 310 Then RMEnsure FPEmulator 4.03 RMLoad System:Modules.FPEmulator
If Boot$OSVersion >= 310 Then RMEnsure SharedCLibrary 5.17 RMLoad System:Modules.CLib
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