From 6bfb6dbcc04f2c267fb4755f71c77f025b8d488d Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Fri, 26 Jun 2009 00:49:44 +0000
Subject: [PATCH] Build process changes
Detail:
Install rule now takes an optional INSTTYPE switch: if this is set to
"libraries" then instead of installing the SCL module, we install the
headers, stubs, ansilib, risc_oslib and overlay manager libraries. This is
intended primarily for the tools CD disc image.
The component is also now cleaned in the "clean" phase. Historically, the
exception made for this component (and OSLib and Desk, both now binary
imports) was made on the grounds of speed, and this is not such an issue
these days. Moreover, we need cleaning to take place on desktop disc builds
because the SCL must be built and installed in both APCS-R and APCS-32
versions, which requires an intermediate clean.
Admin:
Tested in a Tools CD build.
Retagged as 'RISC_OSLib-5_54'
Version 5.54. Not tagged
---
Makefile | 22 +++++++++++++++++++---
VersionASM | 6 +++---
VersionNum | 8 ++++----
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 90ec0d8..ff049ff 100644
--- a/Makefile
+++ b/Makefile
@@ -452,17 +452,33 @@ export_hdrs: ${EXP_HDR}.SharedCLib; @
export_libs: ${EXPORTS} dirs; @
-install: lib.clib
+install: install-${INSTTYPE}
+
+install-: lib.clib
${MKDIR} ${INSTDIR}
${CP} lib.clib ${INSTDIR}.${TARGET} ${CPFLAGS}
@echo ${COMPONENT}: ram module installed
+install-libraries: lib.ansilib lib.ansilibm o.overmgr lib.stubs lib.risc_oslib lib.riscoslibm
+ ${MKDIR} ${INSTDIR}.CLib.h
+ ${CP} CLIB:h.* ${INSTDIR}.CLib.h.* ${CPFLAGS}
+ ${MKDIR} ${INSTDIR}.CLib.o
+ ${CP} lib.ansilib ${INSTDIR}.CLib.o.* ${CPFLAGS}
+ ${CP} lib.ansilibm ${INSTDIR}.CLib.o.* ${CPFLAGS}
+ ${CP} o.overmgr ${INSTDIR}.CLib.o.* ${CPFLAGS}
+ ${CP} lib.stubs ${INSTDIR}.CLib.o.* ${CPFLAGS}
+ ${MKDIR} ${INSTDIR}.RISC_OSLib.h
+ ${CP} RISC_OSLib:h.* ${INSTDIR}.RISC_OSLib.h.* ${CPFLAGS}
+ ${MKDIR} ${INSTDIR}.RISC_OSLib.o
+ ${CP} lib.risc_oslib ${INSTDIR}.RISC_OSLib.o.* ${CPFLAGS}
+ ${CP} lib.riscoslibm ${INSTDIR}.RISC_OSLib.o.* ${CPFLAGS}
+ @echo ${COMPONENT}: libraries installed
+
install_rom: ${OBJECT}
${CP} ${OBJECT} ${INSTDIR}.${TARGET} ${CPFLAGS}
@echo ${COMPONENT}: rom library installed
-clean:
- @echo ${COMPONENT}: *** NOT cleaned *** run locally if required
+clean: clean_all
clean_all:
${WIPE} o.* ${WFLAGS}
diff --git a/VersionASM b/VersionASM
index 6abf0cd..5b7fe57 100644
--- a/VersionASM
+++ b/VersionASM
@@ -14,10 +14,10 @@
Module_MajorVersion SETS "5.54"
Module_Version SETA 554
Module_MinorVersion SETS ""
-Module_Date SETS "14 Jun 2009"
-Module_ApplicationDate SETS "14-Jun-09"
+Module_Date SETS "26 Jun 2009"
+Module_ApplicationDate SETS "26-Jun-09"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "castle/RiscOS/Sources/Lib/RISC_OSLib"
Module_FullVersion SETS "5.54"
-Module_HelpVersion SETS "5.54 (14 Jun 2009)"
+Module_HelpVersion SETS "5.54 (26 Jun 2009)"
END
diff --git a/VersionNum b/VersionNum
index 8a6f897..11f487a 100644
--- a/VersionNum
+++ b/VersionNum
@@ -6,18 +6,18 @@
*/
#define Module_MajorVersion_CMHG 5.54
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 14 Jun 2009
+#define Module_Date_CMHG 26 Jun 2009
#define Module_MajorVersion "5.54"
#define Module_Version 554
#define Module_MinorVersion ""
-#define Module_Date "14 Jun 2009"
+#define Module_Date "26 Jun 2009"
-#define Module_ApplicationDate "14-Jun-09"
+#define Module_ApplicationDate "26-Jun-09"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "castle/RiscOS/Sources/Lib/RISC_OSLib"
#define Module_FullVersion "5.54"
-#define Module_HelpVersion "5.54 (14 Jun 2009)"
+#define Module_HelpVersion "5.54 (26 Jun 2009)"
#define Module_LibraryVersionInfo "5:54"
--
GitLab