From 950dabbd7ae26f64e2b20588c9d394d377c4708d Mon Sep 17 00:00:00 2001
From: ROOL <code@riscosopen.org>
Date: Wed, 28 Aug 2024 18:41:06 +0100
Subject: [PATCH] Enable CI

---
 .gitattributes        |  2 +-
 .gitignore            |  9 +++++++++
 .gitlab-ci.yml        |  3 +++
 Makefile              | 11 +++++++----
 RM/.gitignore         |  2 --
 aof/.gitignore        |  2 --
 {CMHG => cmhg}/header |  0
 debug/.gitignore      |  2 --
 l/.gitignore          |  2 --
 linked/.gitignore     |  2 --
 map/.gitignore        |  2 --
 o/.gitignore          |  2 --
 od/.gitignore         |  2 --
 oz/.gitignore         |  2 --
 14 files changed, 20 insertions(+), 23 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .gitlab-ci.yml
 delete mode 100644 RM/.gitignore
 delete mode 100644 aof/.gitignore
 rename {CMHG => cmhg}/header (100%)
 delete mode 100644 debug/.gitignore
 delete mode 100644 l/.gitignore
 delete mode 100644 linked/.gitignore
 delete mode 100644 map/.gitignore
 delete mode 100644 o/.gitignore
 delete mode 100644 od/.gitignore
 delete mode 100644 oz/.gitignore

diff --git a/.gitattributes b/.gitattributes
index 4046fc9..2aa9af1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 c/** gitlab-language=c linguist-language=c linguist-detectable=true
 h/** gitlab-language=c linguist-language=c linguist-detectable=true
-CMHG/** gitlab-language=cmhg linguist-language=cmhg linguist-detectable=true
+cmhg/** gitlab-language=cmhg linguist-language=cmhg linguist-detectable=true
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..219ae8b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/aif/
+/aof/
+/gpa/
+/i/
+/linked/
+/o/
+/objs/
+/od/
+/rm/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..6303b95
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,3 @@
+include:
+  - project: 'Support/CI'
+    file: '/BootCmds.yml'
diff --git a/Makefile b/Makefile
index deaa8e7..6adbb5c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,15 +17,15 @@
 
 COMPONENT    = BootCmds
 CMHGFILE     = header
-CINCLUDES   += -IOS:,<Lib$Dir>.ConfigLib.
+CINCLUDES    = ${OSINC} ${CONINC}
 CDEFINES    += -DTRACE=0
 OBJS         = main
 LIBS        += ${OSLIB} ${CONLIB}
 HDRS         =
 RES_AREA     = files_messages
 RAMCDEFINES += -DSTANDALONE=1
-INSTRES_FILES   = aif.Repeat
-INSTRES_DEPENDS = aif.Repeat
+INSTRES_FILES   = Repeat
+INSTRES_DEPENDS = Repeat${SUFFIX_ABSOLUTE}
 
 ifeq ("${CMDHELP}","None")
 CMHGDEFINES += -DNO_INTERNATIONAL_HELP
@@ -36,7 +36,10 @@ include CModule
 #
 # Static dependencies
 #
-aif.Repeat: ${DIRS} repeatcmd.c
+Repeat${SUFFIX_ABSOLUTE}: repeatcmd.c
 	${CC} ${CINCLUDES} -o $@ repeatcmd.c ${CLIB} ${OSLIB}
 
+clean::
+	${RM} Repeat${SUFFIX_ABSOLUTE}
+
 # Dynamic dependencies:
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/aof/.gitignore b/aof/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/aof/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/CMHG/header b/cmhg/header
similarity index 100%
rename from CMHG/header
rename to cmhg/header
diff --git a/debug/.gitignore b/debug/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/l/.gitignore b/l/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/l/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/linked/.gitignore b/linked/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/linked/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/map/.gitignore b/map/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/map/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/o/.gitignore b/o/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/o/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/od/.gitignore b/od/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/od/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/oz/.gitignore b/oz/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/oz/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
-- 
GitLab