Mercurial > hg > Members > kono > nitros9-code

changeset 1824:90a008bdcc8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added correct bootfiles, brought realease version vars into line with CoCo makefile
author afra
date Sun, 24 Apr 2005 14:42:18 +0000
parents 53842ca974ae
children f6a8c676b8bb
files level1/makefile.dalpha level1/makefile.dragon
diffstat 2 files changed, 48 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile.dalpha	Sun Apr 24 14:39:00 2005 +0000
+++ b/level1/makefile.dalpha	Sun Apr 24 14:42:18 2005 +0000
@@ -1,14 +1,27 @@
+#
+#6809l1/makefile.dragon
+#
+# 2005-04-24, P.Harvey-Smith.
+# 	Brought into line with CoCo makefile, for generating disk
+#	names baded on CPU/Level/Release number.
+#
+
 include ../rules.mak
 
+CPU		= 6809
+LEVEL		= 1
+
 # TERMWIDTH can be either 32 or 51
 TERMWIDTH	= 51
-RELEASE		= nos96809l1v030204_dalpha
-BOOTFILE	= bootfiles/bootfile_dalpha_$(TERMWIDTH)
-BOOTFILE_DS80	= bootfiles/bootfile_dalpha_$(TERMWIDTH)
+BOOTFILE	= bootfiles/bootfile_dalpha_SS80_$(TERMWIDTH)
+BOOTFILE_DS80	= bootfiles/bootfile_dalpha_DS80_$(TERMWIDTH)
 KERNELFILE	= bootfiles/kernel_dalpha
 DIRS		= cmds modules sys bootfiles
 DDIRS		= modules bootfiles defs
 
+DISTRO		= nos9$(CPU)l$(LEVEL)
+DISTROVER	= $(DISTRO)$(NITROS9VER)_dalpha
+
 # Specify which shell should be used
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
@@ -18,8 +31,8 @@
 KERNEL		= $(shell $(CD) modules; make -f makefile.dragon showkernel)
 SYSMODS		= $(shell $(CD) modules; make -f makefile.dragon showsysmods)
 CLOCKS		= $(shell $(CD) modules; make -f makefile.dragon showclocks)
-RBF			= $(shell $(CD) modules; make -f makefile.dragon showrbf)
-SCF			= $(shell $(CD) modules; make -f makefile.dragon showscf)
+RBF		= $(shell $(CD) modules; make -f makefile.dragon showrbf)
+SCF		= $(shell $(CD) modules; make -f makefile.dragon showscf)
 PIPE		= $(shell $(CD) modules; make -f makefile.dragon showpipe)
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
@@ -28,11 +41,13 @@
 ROOTFILES	= 
 STARTUP		= startup.dalpha
 
-PACKAGENAME	= $(RELEASE).zip
-DSK360K_1	= $(RELEASE)_ss80_1.dsk
-DSK360K_2	= $(RELEASE)_ss80_2.dsk
-DSK720K		= $(RELEASE)_ds80.dsk
-
+PACKAGENAME	= $(DISTROVER).zip
+DSK360K_1       = $(DISTROVER)_80s_1.dsk
+LDSK360K_1      = $(DISTRO)_80s_1.dsk
+DSK360K_2       = $(DISTROVER)_80s_2.dsk
+LDSK360K_2      = $(DISTRO)_80s_2.dsk
+DSK720K         = $(DISTROVER)_80d.dsk
+LDSK720K        = $(DISTRO)_80d.dsk
 
 # Make all components
 all:
--- a/level1/makefile.dragon	Sun Apr 24 14:39:00 2005 +0000
+++ b/level1/makefile.dragon	Sun Apr 24 14:42:18 2005 +0000
@@ -1,15 +1,28 @@
+#
+#6809l1/makefile.dragon
+#
+# 2005-04-24, P.Harvey-Smith.
+# 	Brought into line with CoCo makefile, for generating disk
+#	names baded on CPU/Level/Release number.
+#
+
 include ../rules.mak
 
+CPU		= 6809
+LEVEL		= 1
+
 # TERMWIDTH can be either 32 or 51
 TERMWIDTH	= 51
-RELEASE		= nos96809l1v030204_dragon
-BOOTFILE	= bootfiles/bootfile_d64_$(TERMWIDTH)
-BOOTFILE_DS80	= bootfiles/bootfile_d64_$(TERMWIDTH)
+BOOTFILE	= bootfiles/bootfile_d64_DS40_$(TERMWIDTH)
+BOOTFILE_DS80	= bootfiles/bootfile_d64_DS80_$(TERMWIDTH)
 KERNELFILE	= bootfiles/kernel_d64
 DIRS		= cmds sys 
 #modules bootfiles
 DDIRS		= modules bootfiles defs
 
+DISTRO		= nos9$(CPU)l$(LEVEL)
+DISTROVER	= $(DISTRO)$(NITROS9VER)_dragon
+
 # Specify which shell should be used
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
@@ -29,10 +42,13 @@
 ROOTFILES	= 
 STARTUP		= startup.dragon
 
-PACKAGENAME	= $(RELEASE).zip
-DSK360K_1	= $(RELEASE)_ds40_1.dsk
-DSK360K_2	= $(RELEASE)_ds40_2.dsk
-DSK720K		= $(RELEASE)_ds80.dsk
+PACKAGENAME	= $(DISTROVER).zip
+DSK360K_1       = $(DISTROVER)_40d_1.dsk
+LDSK360K_1      = $(DISTRO)_40d_1.dsk
+DSK360K_2       = $(DISTROVER)_40d_2.dsk
+LDSK360K_2      = $(DISTRO)_40d_2.dsk
+DSK720K         = $(DISTROVER)_80d.dsk
+LDSK720K        = $(DISTRO)_80d.dsk
 
 
 # Make all components