Commit fe925271 authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL

Makefile recreated from fragments

Now it executes in place from ROM, reduce the wimpslot accordingly.
Add a VersionASM, AppName.s, ResFiles.s (needed by modulewrap.s).
Change references to Toolbox headers to use explicit paths in the #includes.
Requires RiscOS/BuildSys!28.

Version 3.27. Tagged as 'Help2-3_27'
parent 339a9614
...@@ -13,129 +13,17 @@ ...@@ -13,129 +13,17 @@
# limitations under the License. # limitations under the License.
# #
# Makefile for Help2 # Makefile for Help2
#
# ***********************************
# *** C h a n g e L i s t ***
# ***********************************
# Date Name Description
# ---- ---- -----------
# 31-Mar-98 RML Created
# 27-Apr-98 RML ROM build rules added
# 01-May-98 RML Creates rm directory
# 21-Sep-02 RPS For ROM,we'll make use of the sprites in the Wimp
#
# Program specific options:
#
COMPONENT = Help
APP = !Help
MODULE = rm.${COMPONENT}
ROM_MODULE = aof.${COMPONENT}
RDIR = Resources
LDIR = ${RDIR}.${LOCALE}
MODULE_NAME = !Help
MODULE_HELP = "!Help"
FILELIST = ${RDIR}.Filelist
#
# Export Paths for Messages module
#
RESDIR = <resource$dir>.Resources.${COMPONENT}
RESAPP = <resource$dir>.Apps.${APP}
include StdTools
#
# Libraries
#
CLIB = CLib:o.stubs
EVENTLIB = tbox:o.eventlib
TOOLBOXLIB = tbox:o.toolboxlib
WIMPLIB = tbox:o.wimplib
#
# Include files
#
INCLUDES = -Itbox:,C:
CFLAGS = ${THROWBACK} -depend !Depend -ffa ${INCLUDES}
FILES =\
${RDIR}.!Boot \
${LDIR}.!Help \
${RDIR}.!Run \
${RDIR}.!RunImage \
${LDIR}.Messages \
${LDIR}.Res
OBJS =\
o.main \
o.help \
o.common
#
# Rule patterns
#
.SUFFIXES: .o
.c.o:; ${CC} ${CFLAGS} ${DFLAGS} -c -o $@ $<
#
# Main rules:
#
rom: ${MODULE}
@${ECHO} ${COMPONENT}: rom module built
install_rom: ${MODULE}
${CP} ${MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@${ECHO} ${COMPONENT}: rom module installed
install: ${FILES}
${MKDIR} ${INSTDIR}.${APP}
${CP} ${RDIR}.!Boot ${INSTDIR}.${APP}.!Boot ${CPFLAGS}
${CP} ${LDIR}.!Help ${INSTDIR}.${APP}.!Help ${CPFLAGS}
${CP} ${RDIR}.!Run ${INSTDIR}.${APP}.!Run ${CPFLAGS}
${CP} ${RDIR}.!RunImage ${INSTDIR}.${APP}.!RunImage ${CPFLAGS}
${INSERTVERSION} ${LDIR}.Messages > ${INSTDIR}.${APP}.Messages
${CP} ${LDIR}.Res ${INSTDIR}.${APP}.Res ${CPFLAGS}
${CP} ${RDIR}.!Sprites ${INSTDIR}.${APP}.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${INSTDIR}.${APP}.!Sprites22 ${CPFLAGS}
${CHMOD} -R 555 ${INSTDIR}.${APP}.*
@${ECHO} ${COMPONENT}: Application installed {Disc}
resources:
${MKDIR} ${RESAPP}
${MKDIR} ${RESDIR}
${CP} ${LDIR}.!Help ${RESAPP}.!Help ${CPFLAGS}
${CP} ${RDIR}.ROM.!Run ${RESAPP}.!Run ${CPFLAGS}
${CP} ${RDIR}.ROM.!Boot ${RESAPP}.!Boot ${CPFLAGS}
${CP} ${LDIR}.Res ${RESDIR}.Res ${CPFLAGS}
${INSERTVERSION} ${LDIR}.Messages > ${RESDIR}.Messages
@${ECHO} ${COMPONENT}: resource files copied to Messages module
clean:
${XWIPE} rm ${WFLAGS}
${XWIPE} o.* ${WFLAGS}
${XWIPE} ${APP} ${WFLAGS}
${RM} ${MODULE}
${RM} ${RDIR}.!RunImage
@${ECHO} ${COMPONENT}: cleaned
#
# Static dependencies:
#
${RDIR}.!RunImage: ${OBJS} ${EVENTLIB} ${TOOLBOXLIB} ${WIMPLIB} ${CLIB}
${LD} -o $@ ${OBJS} ${CLIB} ${EVENTLIB} ${TOOLBOXLIB} ${WIMPLIB}
${SQZ} ${SQZFLAGS} $@
${MODULE}: ${FILES} VersionNum COMPONENT = Help
${MKDIR} rm override TARGET = !RunImage
${GETVERSION} Help2$BuildV Help2$FullV Help2$Date OBJS = common help main
${DO} ${MODGEN} -date "<Help2$Date>" $@ ${MODULE_NAME} ${MODULE_HELP} <Help2$BuildV> -via ${FILELIST} LIBS = ${TBOXLIBS}
INSTTYPE = app
BBETYPE = help2 INSTAPP_FILES = !Boot !Help !Run !RunImage !Sprites !Sprites22 Messages Res
bbe-help2: bbe-generic INSTAPP_VERSION = Messages
BBE_Export_Dir Resources RES_FILES = Messages Res
RESAPP_FILES = !Boot !Help !Run
include CApp
#---------------------------------------------------------------------------
# Dynamic dependencies: # Dynamic dependencies:
Resources.!RunImage Resources.Help.!RunImage
...@@ -18,5 +18,5 @@ RMEnsure ProgInfo 0.09 Error You need ProgInfo 0.09 or later to run Help. ...@@ -18,5 +18,5 @@ RMEnsure ProgInfo 0.09 Error You need ProgInfo 0.09 or later to run Help.
RMEnsure FontMenu 0.17 RMLoad System:modules.toolbox.fontmenu RMEnsure FontMenu 0.17 RMLoad System:modules.toolbox.fontmenu
RMEnsure FontMenu 0.17 Error You need FontMenu 0.17 or later to run Help. RMEnsure FontMenu 0.17 Error You need FontMenu 0.17 or later to run Help.
| Start the application | Start the application
Wimpslot -min 64k -max 64k Wimpslot -min 16k -max 16k
Run <Help$Dir>.!RunImage Desktop_Help %*0
\ No newline at end of file \ No newline at end of file
;
; This file is automatically maintained by srccommit, do not edit manually.
;
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "3.27"
Module_Version SETA 327
Module_MinorVersion SETS ""
Module_Date SETS "04 Nov 2020"
Module_ApplicationDate SETS "04-Nov-20"
Module_ComponentName SETS "Help2"
Module_FullVersion SETS "3.27"
Module_HelpVersion SETS "3.27 (04 Nov 2020)"
END
/* (3.26) /* (3.27)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 3.26 #define Module_MajorVersion_CMHG 3.27
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 Oct 2019 #define Module_Date_CMHG 04 Nov 2020
#define Module_MajorVersion "3.26" #define Module_MajorVersion "3.27"
#define Module_Version 326 #define Module_Version 327
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "12 Oct 2019" #define Module_Date "04 Nov 2020"
#define Module_ApplicationDate "12-Oct-19" #define Module_ApplicationDate "04-Nov-20"
#define Module_ComponentName "Help2" #define Module_ComponentName "Help2"
#define Module_FullVersion "3.26" #define Module_FullVersion "3.27"
#define Module_HelpVersion "3.26 (12 Oct 2019)" #define Module_HelpVersion "3.27 (04 Nov 2020)"
#define Module_LibraryVersionInfo "3:26" #define Module_LibraryVersionInfo "3:27"
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "kernel.h" #include "kernel.h"
#include "wimplib.h" #include "tboxlibs/wimplib.h"
#include "toolbox.h" #include "tboxlibs/toolbox.h"
#include "swis.h" #include "swis.h"
#include "common.h" #include "common.h"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "swis.h" #include "swis.h"
#include "gadgets.h" #include "tboxlibs/gadgets.h"
#include "common.h" #include "common.h"
#include "help.h" #include "help.h"
......
...@@ -29,15 +29,15 @@ ...@@ -29,15 +29,15 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "wimp.h" #include "tboxlibs/wimp.h"
#include "swis.h" #include "swis.h"
#include "wimplib.h" #include "tboxlibs/wimplib.h"
#include "toolbox.h" #include "tboxlibs/toolbox.h"
#include "event.h" #include "tboxlibs/event.h"
#include "window.h" #include "tboxlibs/window.h"
#include "iconbar.h" #include "tboxlibs/iconbar.h"
#include "proginfo.h" #include "tboxlibs/proginfo.h"
#include "menu.h" #include "tboxlibs/menu.h"
#include "help.h" #include "help.h"
#include "common.h" #include "common.h"
#include "defines.h" #include "defines.h"
......
; Copyright 2020 RISC OS Open Limited
;
; 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.
;
; AppName - generated from Messages, used by ModuleWrap
GBLS ApplicationName
GBLS ApplicationVersion
GET VersionASM
ApplicationName SETS "Help"
ApplicationVersion SETS "$Module_MajorVersion ($Module_Date)"
END
; Copyright 2020 RISC OS Open Limited
;
; 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.
;
; > ResFiles
END
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