GitLab has been upgraded to 13.7.4 If you encounter any issues mail code@riscosopen.org

Commit fdd47598 authored by Robert Sprowson's avatar Robert Sprowson

Makefile recreated from fragments

Resource files shuffled into UK subdirectory where required.
Renamed !Sprites22 to !Sprites.
Get version number from messages file.
Built and checked disc install, looks the same as before.

Version 0.25. Tagged as 'builder-0_25'
parent b5fd283e
......@@ -14,5 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
ifthere Run:stripdepnd then stripdepnd <obey$Dir>.Makefile
If "<Alias$EraseCVS>" <> "" then EraseCVS else Echo **EraseCVS not found.
stripdepnd Makefile
| Copyright 1999 Pace Micro Technology plc
| Copyright 2014 Castle Technology Ltd
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine all THROWBACK=-throwback DFLAGS=-DDEBUGLIB
amu_machine debug THROWBACK=-throwback INSTDIR=<Install$Dir>.Apps
| Copyright 1999 Pace Micro Technology plc
|
| 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 install THROWBACK=-throwback INSTDIR=<Install$Dir> DFLAGS=-DDEBUGLIB
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine install THROWBACK=-throwback INSTDIR=<Install$Dir>
amu_machine install THROWBACK=-throwback INSTDIR=<Install$Dir>.Apps
......@@ -12,100 +12,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Makefile for BuildApp
# Makefile for Builder
#
# ***********************************
# *** C h a n g e L i s t ***
# ***********************************
# Date Name Description
# ---- ---- -----------
# 11 Sep 1997 RWB New for BuildApp
# 12 Sep 1997 RWB Added install target
#
#
# Paths
#
EXP_HDR = <export$dir>
#
# Generic options:
#
MKDIR = do mkdir -p
AS = aasm
CC = cc
CMHG = cmhg
CP = copy
LD = link
RM = remove
WIPE = x wipe
CD = dir
CHMOD = access
AFLAGS = -depend !Depend -Stamp -quit -To $@ -From
CFLAGS = -c -depend !Depend ${THROWBACK} ${INCLUDES} ${DFLAGS}
CPFLAGS = ~cfr~v
WFLAGS = ~c~v
CHMODFLAGS = RW/R
#DFLAGS = -DDEBUG
#
# Libraries
#
CLIB = CLIB:o.stubs
RLIB = RISCOSLIB:o.risc_oslib
RSTUBS = RISCOSLIB:o.rstubs
ROMSTUBS = RISCOSLIB:o.romstubs
ROMCSTUBS = RISCOSLIB:o.romcstubs
ABSSYM = RISC_OSLib:o.AbsSym
EVENTLIB = Tbox:o.eventlib
TOOLBOXLIB = Tbox:o.toolboxlib
WIMPLIB = Tbox:o.wimplib
DEBUGLIB = <Lib$Dir>.Debuglib.o.debuglib TCPIPLibs:o.socklib5zm TCPIPLibs:o.inetlibzm
#
# Include files
#
INCLUDES = -ITbox: -IC:
# Program specific options:
#
COMPONENT = Builder
TARGET = !RunImage
APP = ${INSTDIR}.!${COMPONENT}
COMPONENT = Builder
TARGET = !RunImage
INSTTYPE = app
OBJS = main msg env file parse build
CINCLUDES = -ITbox:,C:
CDFLAGS = -DDEBUGLIB
LIBS = ${TBOXLIBS}
INSTAPP_FILES = !Boot !build !Help !Run !Sprites Res !RunImage
INSTAPP_VERSION = Messages
OBJS = o.main o.msg o.env o.file o.parse o.build
include CApp
DBG_LIBS += ${NET5LIBS}
#
# Rule patterns
#
.c.o:; ${CC} ${CFLAGS} -o $@ $<
.cmhg.o:; ${CMHG} -o $@ $<
#
# Build
#
all: ${TARGET}
@echo ${COMPONENT}: all complete
clean:
${WIPE} o.* ${WFLAGS}
${WIPE} ${TARGET} ${WFLAGS}
@echo ${COMPONENT}: cleaned
install: ${TARGET}
${MKDIR} ${APP}
${CP} ${TARGET} ${APP}.${TARGET} ${CPFLAGS}
${CP} Resources.* ${APP}.* ${CPFLAGS}
${CHMOD} ${APP} ${CHMODFLAGS}
${CHMOD} ${APP}.* ${CHMODFLAGS}
@echo ${COMPONENT}: installed
#
# Target
#
${TARGET}: ${OBJS}
${LD} -o $@ ${OBJS} ${DEBUGLIB} ${CLIB} ${EVENTLIB} ${TOOLBOXLIB} ${WIMPLIB}
#
# Dynamic dependencies:
| !Boot for BuildApp
IconSprites <Obey$Dir>.!Sprites22
| !Boot for Builder
IconSprites <Obey$Dir>.!Sprites
| Copyright 1997 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.
|
| !Run for Builder
Set Builder$Dir <Obey$Dir>
IconSprites <Builder$Dir>.!Sprites22
IconSprites <Builder$Dir>.!Sprites
RMENSURE Toolbox 0.00 RMLOAD System:modules.toolbox.toolbox
RMENSURE Toolbox 1.23 ERROR You need toolbox 1.23 or later to run !Adder
RMENSURE Window 0.00 RMLOAD System:modules.toolbox.window
......
_TaskName:Builder
_Version:Filled by build system
mem:Memory allocation error.
bld:No build directory currently defined. Select a directory and try again.
env:No environment currently defined. Select an environment and try again.
......
/* (0.24)
/* (0.25)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.24
#define Module_MajorVersion_CMHG 0.25
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 05 Oct 2013
#define Module_Date_CMHG 23 Jul 2014
#define Module_MajorVersion "0.24"
#define Module_Version 24
#define Module_MajorVersion "0.25"
#define Module_Version 25
#define Module_MinorVersion ""
#define Module_Date "05 Oct 2013"
#define Module_Date "23 Jul 2014"
#define Module_ApplicationDate "05-Oct-13"
#define Module_ApplicationDate "23-Jul-14"
#define Module_ComponentName "builder"
#define Module_ComponentPath "castle/RiscOS/Utilities/Release/builder"
#define Module_FullVersion "0.24"
#define Module_HelpVersion "0.24 (05 Oct 2013)"
#define Module_LibraryVersionInfo "0:24"
#define Module_FullVersion "0.25"
#define Module_HelpVersion "0.25 (23 Jul 2014)"
#define Module_LibraryVersionInfo "0:25"
......@@ -412,7 +412,7 @@ int
proginfo_show(int event_code,ToolboxEvent *event,
IdBlock *id_block, void *handle)
{
proginfo_set_version(0,id_block->self_id,APP_VERSION);
proginfo_set_version(0,id_block->self_id,msg_lookup("_Version"));
return 0;
}
......
......@@ -25,10 +25,6 @@
#ifndef __constants_h
#define __constants_h
#include "VersionNum"
#define APP_VERSION Module_MajorVersion " (" Module_ApplicationDate ") " Module_MinorVersion
#define APP_DIR "<Builder$Dir>"
#define FILENAME_MESSAGES APP_DIR ".Messages"
#define FILE_DEBUG APP_DIR ".debug"
......
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