Cross-compilable

Detail:
* Rewrite makefile to use shared makefiles
* Fix #includes for case-sensitive filesystems
* Replace nested .gitignore files with top-level .gitignore

Admin:
  Requires BuildSys-7_47.


Version 0.62. Not tagged

.gitignore

+/aif/
+/aof/
+/FilerAct,ff8
+/gpa/
+/i/
+/linked/
+/o/
+/objs/
+/od/
+/rm/
+/s/modulewrap

Makefile

@@ -13,169 +13,21 @@
 # limitations under the License.
 #
 # Makefile for Filer Action
-#
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date       Name         Description
-# ----       ----         -----------
-# 25-May-94  AMcC         Created.
-# 30-Aug-94  AMcC         Added rom_link rule.
-
-#
-# Paths
-#
-EXP_HDR = <export$dir>
-
-#
-# Generic options:
-#
-include StdTools
-
-#DFLAGS  = -Ddebugfile="\"RAM::0.$.out\""
-AFLAGS  = -depend !Depend -Stamp -quit
-CFLAGS  = -c -throwback -depend !Depend -ffah ${INCLUDES} ${DFLAGS} 
-CPFLAGS = ~cfr~v
-WFLAGS  = ~c~v
-
-#
-# Libraries
-#
-CLIB     = CLIB:o.stubs
-RLIB     = RISC_OSLIB:o.risc_oslib
-RSTUBS   = RISC_OSLIB:o.rstubs
-ROMSTUBS = RISC_OSLIB:o.romstubs
-ABSSYM   = RISC_OSLib:o.AbsSym
-
-#
-# Include files
-#
-INCLUDES = -IC:
-
-# Note: the wrapper contains filer action specific code!
-WRAPPER   = RISCOSLIB:s.ModuleWrap
-
-#
-# Program specific options:
-#
-COMPONENT = FilerAct
-TARGET    = aof.FilerAct
-EXPORTS   = ${EXP_HDR}.FilerAct
-
-OBJS =\
- o.actionwind\
- o.Initialise\
- o.Buttons\
- o.allerrs\
- o.memmanage\
- o.listfiles\
- o.Chains\
- o.dboxlong\
- o.debug
-
-APP_OBJS =\
- oa.actionwind\
- oa.Initialise\
- oa.Buttons\
- o.allerrs\
- oa.memmanage\
- oa.listfiles\
- oa.Chains\
- oa.dboxlong\
- oa.debug
-
-#
-# Rule patterns
-#
-.SUFFIXES: .oa
-
-.c.o:;      ${CC} ${CFLAGS} -zM -o $@ $<
-.c.oa:;     ${CC} ${CFLAGS} -o $@ $<
-.s.o:;      ${AS} ${AFLAGS} $< $@
-
-#
-# Test/development rules:
-#
-all: rm.FilerAct
-	@echo ${COMPONENT}: relocatable module built
-
-app: app.FilerAct
-	@echo ${COMPONENT}: application built
-
-test: app.FilerAct
-	Set FilerAct$Path <Obey$Dir>.Resources.UK.
-	Set Alias$Filer_Action <Obey$Dir>.app.FilerAct %%*0
-
-reset:
-	Set FilerAct$Path Resources:$.Resources.FilerAct.
-	UnSet Alias$Filer_Action
-
-#
-# RISC OS ROM build rules:
-#
-rom: ${TARGET}
-	@echo ${COMPONENT}: rom module built
-
-export: ${EXPORTS}
-	@echo ${COMPONENT}: export complete
-
-install_rom: ${TARGET}
-	${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom module installed
-
-clean:
-	${XWIPE} o.* ${WFLAGS}
-	${XWIPE} oa.* ${WFLAGS}
-	${XWIPE} app.* ${WFLAGS}
-	${XWIPE} rm.* ${WFLAGS}
-	${XWIPE} linked.* ${WFLAGS}
-	${XWIPE} map.* ${WFLAGS}
-	${RM} ${TARGET}
-	${RM} s.ModuleWrap
-	@echo ${COMPONENT}: cleaned
-
-resources: resources-${CMDHELP}
-	@echo ${COMPONENT}: resource files copied
-
-resources_common:
-	${MKDIR} ${RESDIR}.${COMPONENT}
-	${CP} LocalRes:Messages  ${RESDIR}.${COMPONENT}.Messages  ${CPFLAGS}
-	${CP} LocalRes:Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
-
-resources-None: resources_common
-	@
-
-resources-: resources_common
-	print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
-
-${EXP_HDR}.FilerAct: hdr.FilerAct
-	${CP} hdr.FilerAct $@ ${CPFLAGS}
-#
-# ROM target (re-linked at ROM Image build time)
-#
-${TARGET}: ${OBJS} o.ModuleWrap ${ROMSTUBS}
-	${LD} -o $@ -aof ${OBJS} o.ModuleWrap ${ROMSTUBS}
-
-#
-# Final link for the ROM Image (using given base address)
-#
-rom_link:
-	${LD} -o linked.${COMPONENT} -rmf -base ${ADDRESS} ${TARGET} ${ABSSYM}
-	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom_link complete
-
-rm.FilerAct: ${OBJS} o.ModuleWrap ${RSTUBS}
-	${LD} -o $@ -module ${OBJS} o.ModuleWrap ${RSTUBS}
-
-# Application
-#
-app.FilerAct: ${APP_OBJS} ${CLIB} ${RLIB}
-	${LD} -o $@ ${APP_OBJS} ${CLIB} ${RLIB}
-
-o.ModuleWrap: s.ModuleWrap
-	${AS} ${AFLAGS} s.ModuleWrap $@
 
-s.ModuleWrap: ${WRAPPER}
-	${CP} ${WRAPPER} $@ ${CPFLAGS}
+COMPONENT    ?= Filer_Action
+TARGET       ?= FilerAct
+HDRS          =
+ASMHDRS       = FilerAct
+INSTRES_FILES = Templates
+CMHGFILE      =
+OBJS          = actionwind Initialise Buttons allerrs memmanage listfiles Chains dboxlong debug
+RES_OBJ       =
+SA_LIBS       = ${RSTUBS}
+ROM_LIBS      = ${ROMSTUBS}
+ROM_SYMS      = ${ABSSYM}
+CFLAGS        = ${C_STKCHK}
+MODULEWRAP    = yes
+
+include CModule
 
 # Dynamic dependencies:

MkApp,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine app
+amu_machine -f app/mk

MkClean,fd7

@@ -15,3 +15,5 @@
 Dir <Obey$Dir>
 amu_machine clean
 stripdepnd
+amu_machine -f app/mk clean
+stripdepnd app/mk

VersionASM

@@ -12,9 +12,9 @@
 Module_MajorVersion     SETS    "0.62"
 Module_Version          SETA    62
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "12 Feb 2020"
-Module_ApplicationDate  SETS    "12-Feb-20"
+Module_Date             SETS    "27 Jun 2020"
+Module_ApplicationDate  SETS    "27-Jun-20"
 Module_ComponentName    SETS    "FilerAct"
 Module_FullVersion      SETS    "0.62"
-Module_HelpVersion      SETS    "0.62 (12 Feb 2020)"
+Module_HelpVersion      SETS    "0.62 (27 Jun 2020)"
                         END

VersionNum

@@ -4,18 +4,18 @@
  *
  */
 #define Module_MajorVersion_CMHG        0.62
-#define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                12 Feb 2020
+#define Module_MinorVersion_CMHG
+#define Module_Date_CMHG                27 Jun 2020
 
 #define Module_MajorVersion             "0.62"
 #define Module_Version                  62
 #define Module_MinorVersion             ""
-#define Module_Date                     "12 Feb 2020"
+#define Module_Date                     "27 Jun 2020"
 
-#define Module_ApplicationDate          "12-Feb-20"
+#define Module_ApplicationDate          "27-Jun-20"
 
 #define Module_ComponentName            "FilerAct"
 
 #define Module_FullVersion              "0.62"
-#define Module_HelpVersion              "0.62 (12 Feb 2020)"
+#define Module_HelpVersion              "0.62 (27 Jun 2020)"
 #define Module_LibraryVersionInfo       "0:62"

aof/.gitignore

-*
-!.gitignore

app.mk

+# 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.
+#
+# Makefile for Filer Action
+
+COMPONENT    ?= Filer_Action
+TARGET       ?= FilerAct
+OBJS          = actionwind Initialise Buttons allerrs memmanage listfiles Chains dboxlong debug
+LIBS          = ${RLIB}
+
+include CApp
+
+test: app.FilerAct
+	Set FilerAct$Path <Obey$Dir>.Resources.UK.
+	Set Alias$Filer_Action <Obey$Dir>.app.FilerAct %%*0
+
+reset:
+	Set FilerAct$Path Resources:$.Resources.FilerAct.
+	UnSet Alias$Filer_Action
+
+# Dynamic dependencies:

app/.gitignore

-*
-!.gitignore

linked/.gitignore

-*
-!.gitignore

map/.gitignore

-*
-!.gitignore

o/.gitignore

-*
-!.gitignore

oa/.gitignore

-*
-!.gitignore

rm/.gitignore

-*
-!.gitignore