Commit 4a60f094 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Build process improvements:

  !MkRam,fd7 added to enable RAM builds of all Toolbox modules
  MakeFile tidied up and support for RAM build added
Module now uses Toolbox memory allocation instead of calling OS_Module.
parent 781c7c6f
| Copyright 1998 Acorn Computers Ltd
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
| You may obtain a copy of the License at
|
| http://www.apache.org/licenses/LICENSE-2.0
|
| Unless required by applicable law or agreed to in writing, software
| distributed under the License is distributed on an "AS IS" BASIS,
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
| See the License for the specific language governing permissions and
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine all
......@@ -20,6 +20,7 @@
# Date Name Description
# ---- ---- -----------
# 06-Jan-94 AMcC Created
# 04-Feb-98 SNB Updated to allow RAM builds
#
#
......@@ -27,6 +28,7 @@
#
COMPONENT = DCS
ROM_MODULE = aof.${COMPONENT}
RAM_MODULE = rm.${COMPONENT}
#
# Export Paths for Messages module
......@@ -41,6 +43,7 @@ CC = cc
CMHG = cmhg
CP = copy
LD = link
TLD = tlink
RM = remove
WIPE = -wipe
......@@ -48,7 +51,8 @@ CPFLAGS = ~cfr~v
WFLAGS = ~c~v
CFLAGS = -c -depend !Depend ${INCLUDES} -zM -ffa -zps1 ${DFLAGS}
DFLAGS = -DROM
DFLAGS = -D${SYSTEM}
ROMFLAGS = -DROM
INCLUDES = -I<Lib$Dir>.tboxlibint.,<Lib$Dir>.tboxlibs:,C:
#
......@@ -73,16 +77,39 @@ OBJS =\
o.show\
o.task
RAM_OBJS =\
o.ModNoDebug\
o.create\
o.delete\
o.events\
o.getstate\
o.hide\
o.mainRAM\
o.miscop\
o.show\
o.task
DCSRESF=o.res_dcs
DCSMESS=o.msgs_dcs
QUITRESF=o.res_quit
QUITMESS=o.msgs_quit
ALLRESOURCES=${DCSRESF} ${DCSMESS} ${QUITRESF} ${QUITMESS}
#
# Rule patterns
#
.c.o:; ${CC} ${CFLAGS} -o $@ $<
.c.o:; ${CC} ${CFLAGS} ${ROMFLAGS} -o $@ $<
.cmhg.o:; ${CMHG} -o $@ $<
#
# Main rules:
#
#
all: ${RAM_MODULE}
@echo ${COMPONENT}: Module built (RAM)
rom: ${ROM_MODULE}
@echo ${COMPONENT}: Module built (ROM)
......@@ -97,6 +124,7 @@ resources: Resources.${LOCALE}.DCS.Messages Resources.${LOCALE}.DCS.Res Resource
clean:
${WIPE} o.* ${WFLAGS}
${WIPE} aof ${WFLAGS}
${WIPE} rm ${WFLAGS}
${WIPE} linked ${WFLAGS}
${WIPE} map ${WFLAGS}
@echo ${COMPONENT}: cleaned
......@@ -115,5 +143,24 @@ rom_link:
${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom_link complete
${DCSRESF}: @.Resources.${LOCALE}.DCS.Res
resgen dcsres_file ${DCSRESF} Resources.${LOCALE}.DCS.Res Resources.DCS.Res
${DCSMESS}: @.Resources.${LOCALE}.DCS.Messages
resgen dcsmess_file ${DCSMESS} Resources.${LOCALE}.DCS.Messages Resources.DCS.Messages
${QUITRESF}: @.Resources.${LOCALE}.Quit.Res
resgen quitres_file ${QUITRESF} Resources.${LOCALE}.Quit.Res Resources.Quit.Res
${QUITMESS}: @.Resources.${LOCALE}.Quit.Messages
resgen quitmess_file ${QUITMESS} Resources.${LOCALE}.Quit.Messages Resources.Quit.Messages
${RAM_MODULE}: ${RAM_OBJS} ${TBOXLIB} ${ALLRESOURCES}
${mkdir} rm
${TLD} -o $@ -module ${RAM_OBJS} ${TBOXLIB} ${ALLRESOURCES}
Access $@ RW/R
o.mainRAM: main.c
$(CC) ${CFLAGS} -o $@ main.c
#---------------------------------------------------------------------------
# Dynamic dependencies:
# Messages file for the DCS Object Module
#{DictTokens}
E01:Memory allocation failed.
E02:There are still DCS tasks active.
# Messages file for the Quit Object Module
......@@ -41,6 +41,7 @@
#include "object.h"
#include "events.h"
#include "task.h"
#include "show.h"
static Object *show_obj=NULL;
static DCSAboutToBeShownEvent show_ev;
......
......@@ -27,7 +27,7 @@ service-call-handler: DCS_services 0x44ec1,0x44ec2,0x44ec3
title-string: DCS
help-string: DCS_Object 1.06
help-string: DCS_Object 1.07
swi-chunk-base-number: 0x82a80
......
......@@ -27,7 +27,7 @@ service-call-handler: DCS_services 0x44ec1,0x44ec2,0x44ec3
title-string: DCS
help-string: DCS_Object 1.06
help-string: DCS_Object 1.07
command-keyword-table: DCS_commands
DCS_Memory()
......
/* Copyright 1996 Acorn Computers Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* Title: copy.h
* Purpose: copy a Generic Object
* Author: IDJ
* History: 7-Oct-93: IDJ: created
*
*/
#ifndef __copy_h
#define __copy_h
#include "kernel.h"
#ifndef __task_h
#include "task.h"
#endif
extern _kernel_oserror *copy_object (_kernel_swi_regs *r, TaskDescriptor *t,int class);
#endif
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