From 05e7377cba98f9e1b0d658efaf40558897c92fca Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@riscosopen.org>
Date: Tue, 5 Mar 2019 17:43:25 +0000
Subject: [PATCH] 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'
---
.gitignore | 6 ++++++
.gitlab-ci.yml | 3 +++
Makefile | 10 +---------
VersionASM | 15 ++++++---------
VersionNum | 24 +++++++++++-------------
rm/.gitignore | 2 --
s/DeviceFS | 12 ++----------
s/ResFiles | 29 -----------------------------
Version => s/Version | 0
9 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 .gitignore
create mode 100644 .gitlab-ci.yml
delete mode 100644 rm/.gitignore
delete mode 100644 s/ResFiles
rename Version => s/Version (100%)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b6c232e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/aif/
+/gpa/
+/o/
+/objs/
+/Makefile.d
+/rm/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..701cd8c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,3 @@
+include:
+ - project: 'Support/CI'
+ file: '/DeviceFS.yml'
diff --git a/Makefile b/Makefile
index 73cf48a..69cfa7c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,22 +14,14 @@
#
# Makefile for DeviceFS
#
-# ***********************************
-# *** C h a n g e L i s t ***
-# ***********************************
-# Date Name Description
-# ---- ---- -----------
-# 07-Mar-01 SNB Recreated
-#
COMPONENT = DeviceFS
HEADER1 = DeviceFS
# C headers to generate from the assembler sources
ASMCHEADER1 = DeviceFS
-EXPORTS = ${C_EXP_HDR}.${ASMCHEADER1}
+EXPORTS = ${C_EXP_HDR}${SEP}${ASMCHEADER1}${SUFFIX_HEADER}
-include StdTools
include AAsmModule
# Dynamic dependencies:
diff --git a/VersionASM b/VersionASM
index 117d6c9..2c674c9 100644
--- a/VersionASM
+++ b/VersionASM
@@ -1,6 +1,5 @@
;
; This file is automatically maintained by srccommit, do not edit manually.
-; Last processed by srccommit version: 1.1.
;
GBLS Module_MajorVersion
GBLA Module_Version
@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
- GBLS Module_ComponentPath
-Module_MajorVersion SETS "0.73"
-Module_Version SETA 73
+Module_MajorVersion SETS "0.74"
+Module_Version SETA 74
Module_MinorVersion SETS ""
-Module_Date SETS "23 Apr 2016"
-Module_ApplicationDate SETS "23-Apr-16"
+Module_Date SETS "23 Dec 2024"
+Module_ApplicationDate SETS "23-Dec-24"
Module_ComponentName SETS "DeviceFS"
-Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/DeviceFS"
-Module_FullVersion SETS "0.73"
-Module_HelpVersion SETS "0.73 (23 Apr 2016)"
+Module_FullVersion SETS "0.74"
+Module_HelpVersion SETS "0.74 (23 Dec 2024)"
END
diff --git a/VersionNum b/VersionNum
index d7efe90..b1420ae 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,21 @@
-/* (0.73)
+/* (0.74)
*
* 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_MinorVersion_CMHG
-#define Module_Date_CMHG 23 Apr 2016
+#define Module_MajorVersion_CMHG 0.74
+#define Module_MinorVersion_CMHG
+#define Module_Date_CMHG 23 Dec 2024
-#define Module_MajorVersion "0.73"
-#define Module_Version 73
+#define Module_MajorVersion "0.74"
+#define Module_Version 74
#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_ComponentPath "castle/RiscOS/Sources/HWSupport/DeviceFS"
-#define Module_FullVersion "0.73"
-#define Module_HelpVersion "0.73 (23 Apr 2016)"
-#define Module_LibraryVersionInfo "0:73"
+#define Module_FullVersion "0.74"
+#define Module_HelpVersion "0.74 (23 Dec 2024)"
+#define Module_LibraryVersionInfo "0:74"
diff --git a/rm/.gitignore b/rm/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/rm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/s/DeviceFS b/s/DeviceFS
index aaf3dc5..d581922 100644
--- a/s/DeviceFS
+++ b/s/DeviceFS
@@ -173,7 +173,7 @@
GET hdr:ResourceFS
GET VersionASM
- GET Version
+ GET Version.s
GET Errors.s
GET Macros.s
@@ -577,17 +577,9 @@ serviceentry LDR wp, [wp] ; wp -> workspac
Pull "r0-r2, pc"
- GBLS conditionalgetbodge
[ standalonemessages
- GBLS ApplicationName
-ApplicationName SETS "DeviceFS"
-conditionalgetbodge SETS "GET s.ResFiles"
resourcefsfiles
- |
-conditionalgetbodge SETS ""
- ]
- $conditionalgetbodge
- [ standalonemessages
+ ResourceFile $MergedMsgs, Resources.DeviceFS.Messages
DCD 0
]
diff --git a/s/ResFiles b/s/ResFiles
deleted file mode 100644
index 1640ed8..0000000
--- a/s/ResFiles
+++ /dev/null
@@ -1,29 +0,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
diff --git a/Version b/s/Version
similarity index 100%
rename from Version
rename to s/Version
--
GitLab