Commit 05e7377c authored by Ben Avison's avatar Ben Avison Committed by ROOL
Browse files

Cross-compilable

Detail:
* Makefile: get directory separator and header extension from shared makefiles
* Use ResourceFile macro directly for standalone case
* Enable GitLab CI

Version 0.74. Tagged as 'DeviceFS-0_74'
parent 5cfd49c3
/aif/
/gpa/
/o/
/objs/
/Makefile.d
/rm/
include:
- project: 'Support/CI'
file: '/DeviceFS.yml'
...@@ -14,22 +14,14 @@ ...@@ -14,22 +14,14 @@
# #
# Makefile for DeviceFS # Makefile for DeviceFS
# #
# ***********************************
# *** C h a n g e L i s t ***
# ***********************************
# Date Name Description
# ---- ---- -----------
# 07-Mar-01 SNB Recreated
#
COMPONENT = DeviceFS COMPONENT = DeviceFS
HEADER1 = DeviceFS HEADER1 = DeviceFS
# C headers to generate from the assembler sources # C headers to generate from the assembler sources
ASMCHEADER1 = DeviceFS ASMCHEADER1 = DeviceFS
EXPORTS = ${C_EXP_HDR}.${ASMCHEADER1} EXPORTS = ${C_EXP_HDR}${SEP}${ASMCHEADER1}${SUFFIX_HEADER}
include StdTools
include AAsmModule include AAsmModule
# Dynamic dependencies: # Dynamic dependencies:
; ;
; This file is automatically maintained by srccommit, do not edit manually. ; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
; ;
GBLS Module_MajorVersion GBLS Module_MajorVersion
GBLA Module_Version GBLA Module_Version
...@@ -10,14 +9,12 @@ ...@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate GBLS Module_ApplicationDate
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath Module_MajorVersion SETS "0.74"
Module_MajorVersion SETS "0.73" Module_Version SETA 74
Module_Version SETA 73
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "23 Apr 2016" Module_Date SETS "23 Dec 2024"
Module_ApplicationDate SETS "23-Apr-16" Module_ApplicationDate SETS "23-Dec-24"
Module_ComponentName SETS "DeviceFS" Module_ComponentName SETS "DeviceFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/DeviceFS" Module_FullVersion SETS "0.74"
Module_FullVersion SETS "0.73" Module_HelpVersion SETS "0.74 (23 Dec 2024)"
Module_HelpVersion SETS "0.73 (23 Apr 2016)"
END END
/* (0.73) /* (0.74)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.73 #define Module_MajorVersion_CMHG 0.74
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Apr 2016 #define Module_Date_CMHG 23 Dec 2024
#define Module_MajorVersion "0.73" #define Module_MajorVersion "0.74"
#define Module_Version 73 #define Module_Version 74
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "23 Apr 2016" #define Module_Date "23 Dec 2024"
#define Module_ApplicationDate "23-Apr-16" #define Module_ApplicationDate "23-Dec-24"
#define Module_ComponentName "DeviceFS" #define Module_ComponentName "DeviceFS"
#define Module_ComponentPath "castle/RiscOS/Sources/HWSupport/DeviceFS"
#define Module_FullVersion "0.73" #define Module_FullVersion "0.74"
#define Module_HelpVersion "0.73 (23 Apr 2016)" #define Module_HelpVersion "0.74 (23 Dec 2024)"
#define Module_LibraryVersionInfo "0:73" #define Module_LibraryVersionInfo "0:74"
*
!.gitignore
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
GET hdr:ResourceFS GET hdr:ResourceFS
GET VersionASM GET VersionASM
GET Version GET Version.s
GET Errors.s GET Errors.s
GET Macros.s GET Macros.s
...@@ -577,17 +577,9 @@ serviceentry LDR wp, [wp] ; wp -> workspac ...@@ -577,17 +577,9 @@ serviceentry LDR wp, [wp] ; wp -> workspac
Pull "r0-r2, pc" Pull "r0-r2, pc"
GBLS conditionalgetbodge
[ standalonemessages [ standalonemessages
GBLS ApplicationName
ApplicationName SETS "DeviceFS"
conditionalgetbodge SETS "GET s.ResFiles"
resourcefsfiles resourcefsfiles
| ResourceFile $MergedMsgs, Resources.DeviceFS.Messages
conditionalgetbodge SETS ""
]
$conditionalgetbodge
[ standalonemessages
DCD 0 DCD 0
] ]
......
; 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.
;
; > Sources.ResFiles
;
MACRO
$lab MyFileR $name
$lab ResourceFile $MergedMsgs, Resources.$ApplicationName..$name
MEND
; Insert here the names of the files to be put into Resources:$.Resources.<app>
; The source files are held in the DataFiles directory
; eg. MyFileR !RunImage
MyFileR Messages
END
File moved
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