Mercurial > hg > Members > kono > nitros9-code

changeset 1787:0af3f5f84033

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tons 'o changes
author boisy
date Sat, 09 Apr 2005 16:11:11 +0000
parents 49c4db9a5f69
children 089d484a4b35
files defs/releasedefs level1/cmds/login.asm level1/defsfile level1/makefile level1/modules/init.asm level1/modules/sysgo.asm level2/coco3/bootlists/standard.bl level2/coco3_6309/bootlists/standard.bl level2/makefile rules.mak scripts/bundi
diffstat 11 files changed, 69 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/defs/releasedefs	Sat Apr 09 01:54:24 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-* Release defsfile for all versions of NitrOS-9
-*
-*
-* NitrOS-9 Version equates
-NOS9Vrsn  equ   3
-NOS9Major equ   2
-NOS9Minor equ   5
-* If DEVEL is 1, then sysgo shows that a development
-* version is being run.
-DEVEL     equ   1
--- a/level1/cmds/login.asm	Sat Apr 09 01:54:24 2005 +0000
+++ b/level1/cmds/login.asm	Sat Apr 09 16:11:11 2005 +0000
@@ -76,11 +76,11 @@
          ENDC
          ENDC
          fcc   " V0"
-         fcb   48+NOS9Vrsn
+         fcb   48+_$NITROS9VERSION
          fcc   ".0"
-         fcb   48+NOS9Major
+         fcb   48+_$NITROS9MAJOR
          fcc   ".0"
-         fcb   48+NOS9Minor
+         fcb   48+_$NITROS9MINOR
          fcb   C$LF
 WideMsgL equ   *-WideMsg
 NrrwMsg  fcb   C$LF,C$LF
@@ -101,11 +101,11 @@
          ENDC
          ENDC
          fcc   " V0"
-         fcb   48+NOS9Vrsn
+         fcb   48+_$NITROS9VERSION
          fcc   ".0"
-         fcb   48+NOS9Major
+         fcb   48+_$NITROS9MAJOR
          fcc   ".0"
-         fcb   48+NOS9Minor
+         fcb   48+_$NITROS9MINOR
          fcb   C$LF
 NrrwMsgL equ   *-NrrwMsg
 UName    fcb   C$LF
--- a/level1/defsfile	Sat Apr 09 01:54:24 2005 +0000
+++ b/level1/defsfile	Sat Apr 09 16:11:11 2005 +0000
@@ -4,4 +4,3 @@
          use   scfdefs
          use   rbfdefs
          use   systype
-         use   releasedefs
--- a/level1/makefile	Sat Apr 09 01:54:24 2005 +0000
+++ b/level1/makefile	Sat Apr 09 16:11:11 2005 +0000
@@ -1,8 +1,14 @@
 include ../rules.mak
 
 CPU		= 6809
-DISTRO		= $(CPU)L2
-RELEASE		= nos9$(CPU)l1v030205
+LEVEL		= 1
+
+# Level 1 - Specify which shell should be used
+#WHICHSHELL	= shellplus
+WHICHSHELL	= shell_21
+
+DISTRO		= nos9$(CPU)l$(LEVEL)
+DISTROVER	= $(DISTRO)$(NITROS9VER)
 BOOTFILE_CO32	= bootfiles/bootfile_co51
 BOOTFILE_CO51	= bootfiles/bootfile_co51
 BOOTFILE_CO80	= bootfiles/bootfile_co51
@@ -10,9 +16,6 @@
 KERNELFILE	= bootfiles/kernel_1773
 DIRS		= cmds modules defs sys bootfiles
 
-# Specify which shell should be used
-#WHICHSHELL	= shellplus
-WHICHSHELL	= shell_21
 
 CMDS		= $(shell $(CD) cmds; make showcocoobjs)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
@@ -28,13 +31,13 @@
 DEFS		= $(shell $(CD) defs; make showobjs)
 ROOTFILES	= startup
 
-PACKAGENAME	= $(RELEASE).zip
-DSK360K_1       = $(RELEASE)_40d_1.dsk
-LDSK360K_1      = latest_40d_1.dsk
-DSK360K_2       = $(RELEASE)_40d_2.dsk
-LDSK360K_2      = latest_40d_2.dsk
-DSK720K         = $(RELEASE)_80d.dsk
-LDSK720K        = latest_80d.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
@@ -51,9 +54,8 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) $(DSK360K_1_50HZ) \
-	$(LDSK360K_1_50HZ) $(DSK360K_2) $(LDSK360K_2)  $(DSK720K) \
-	$(LDSK720K) $(DSK720K_50HZ) $(LDSK720K_50HZ)
+	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) \
+	$(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K)
 
 
 dsk: all $(PACKAGENAME)
--- a/level1/modules/init.asm	Sat Apr 09 01:54:24 2005 +0000
+++ b/level1/modules/init.asm	Sat Apr 09 16:11:11 2005 +0000
@@ -48,9 +48,9 @@
          fdb   DefBoot    offset to boot module name
          fcb   $01        write protect flag (?)
          fcb   Level      OS level
-         fcb   NOS9Vrsn   OS version
-         fcb   NOS9Major  OS major revision
-         fcb   NOS9Minor  OS minor revision
+         fcb   _$NITROS9VERSION   OS version
+         fcb   _$NITROS9MAJOR     OS major revision
+         fcb   _$NITROS9MINOR     OS minor revision
          fcb   CRCOff     feature byte #1
          fcb   $00        feature byte #2
          fcb   0,0,0,0,0,0,0,0  reserved
--- a/level1/modules/sysgo.asm	Sat Apr 09 01:54:24 2005 +0000
+++ b/level1/modules/sysgo.asm	Sat Apr 09 16:11:11 2005 +0000
@@ -59,15 +59,15 @@
          fcc   /Level /
          fcb   '0+Level
          fcc   / V0/
-         fcb   '0+NOS9Vrsn
+         fcb   '0+_$NITROS9VERSION
          fcc   /.0/
-         fcb   '0+NOS9Major
+         fcb   '0+_$NITROS9MAJOR
          fcc   /.0/
-         fcb   '0+NOS9Minor
+         fcb   '0+_$NITROS9MINOR
          fcb   C$CR,C$LF
          fcc   /(C) 2004 The NitrOS-9 Project/
          fcb   C$CR,C$LF
-         IFNE  DEVEL
+         IFNE  _$NITROS9DEVEL
          fcc   "**   DEVELOPMENT BUILD   **"
          fcb   C$CR,C$LF
          fcc   "** NOT FOR DISTRIBUTION! **"
@@ -75,11 +75,7 @@
          ENDC
 * For ROM version, cut down on verbage
          IFEQ  ROM
-         IFNE  DEVEL
-         dts
-         ELSE
-         fcc   "Release Date: 08/03/2004"
-         ENDC
+         dts   
          fcb   C$CR,C$LF
          fcc   !http://www.nitros9.org!
          fcb   C$CR,C$LF
--- a/level2/coco3/bootlists/standard.bl	Sat Apr 09 01:54:24 2005 +0000
+++ b/level2/coco3/bootlists/standard.bl	Sat Apr 09 16:11:11 2005 +0000
@@ -179,10 +179,6 @@
 *../MODULES/SCF/sc6551.dr
 *../MODULES/SCF/t2_sc6551.dd
 *../MODULES/SCF/t3_sc6551.dd
-* 6552 ACIA
-*../MODULES/SCF/dacia.dr
-*../MODULES/SCF/t2_dacia.dd
-*../MODULES/SCF/t3_dacia.dd
 * Tandy Modem Pak
 *../MODULES/SCF/modpak.dr
 *../MODULES/SCF/m1.dd
--- a/level2/coco3_6309/bootlists/standard.bl	Sat Apr 09 01:54:24 2005 +0000
+++ b/level2/coco3_6309/bootlists/standard.bl	Sat Apr 09 16:11:11 2005 +0000
@@ -179,10 +179,6 @@
 *../MODULES/SCF/sc6551.dr
 *../MODULES/SCF/t2_sc6551.dd
 *../MODULES/SCF/t3_sc6551.dd
-* 6552 ACIA
-*../MODULES/SCF/dacia.dr
-*../MODULES/SCF/t2_dacia.dd
-*../MODULES/SCF/t3_dacia.dd
 * Tandy Modem Pak
 *../MODULES/SCF/modpak.dr
 *../MODULES/SCF/m1.dd
--- a/level2/makefile	Sat Apr 09 01:54:24 2005 +0000
+++ b/level2/makefile	Sat Apr 09 16:11:11 2005 +0000
@@ -1,8 +1,10 @@
 include ../rules.mak
 
 CPU		= 6809
-DISTRO		= $(CPU)L2
-RELEASE		= nos9$(CPU)l2v030205
+LEVEL		= 1
+
+DISTRO		= nos9$(CPU)l$(LEVEL)
+DISTROVER	= $(DISTRO)$(NITROS9VER)
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
 BOOTFILE_40D_50HZ	= bootfiles/bootfile_40d_50hz
@@ -27,17 +29,17 @@
 ROOTFILES	= startup
 SYSGO		= sysgo_dd
 
-PACKAGENAME	= $(RELEASE).zip
-DSK360K_1	= $(RELEASE)_40d_1.dsk
-LDSK360K_1	= latest_40d_1.dsk
-DSK360K_1_50HZ	= $(RELEASE)_40d_1_50hz.dsk
-LDSK360K_1_50HZ	= latest_40d_1_50hz.dsk
-DSK360K_2	= $(RELEASE)_40d_2.dsk
-LDSK360K_2	= latest_40d_2.dsk
-DSK720K		= $(RELEASE)_80d.dsk
-LDSK720K	= latest_80d.dsk
-DSK720K_50HZ	= $(RELEASE)_80d_50hz.dsk
-LDSK720K_50HZ	= latest_80d_50hz.dsk
+PACKAGENAME	= $(DISTROVER).zip
+DSK360K_1	= $(DISTROVER)_40d_1.dsk
+LDSK360K_1	= $(DISTRO)_40d_1.dsk
+DSK360K_1_50HZ	= $(DISTROVER)_40d_1_50hz.dsk
+LDSK360K_1_50HZ	= $(DISTRO)_40d_1_50hz.dsk
+DSK360K_2	= $(DISTROVER)_40d_2.dsk
+LDSK360K_2	= $(DISTRO)_40d_2.dsk
+DSK720K		= $(DISTROVER)_80d.dsk
+LDSK720K	= $(DISTRO)_80d.dsk
+DSK720K_50HZ	= $(DISTROVER)_80d_50hz.dsk
+LDSK720K_50HZ	= $(DISTRO)_80d_50hz.dsk
 TESTDSK		= test.dsk
 
 
--- a/rules.mak	Sat Apr 09 01:54:24 2005 +0000
+++ b/rules.mak	Sat Apr 09 16:11:11 2005 +0000
@@ -5,6 +5,7 @@
 # Environment variables are now used to specify any directories other
 # than the defaults below:
 #
+#   NITROS9VER   - current version string for NitrOS-9
 #   NITROS9DIR   - base directory of the NitrOS-9 project on your system
 #   COCOTOOLSBIN - directory where CoCoTools binaries are (assembler, etc)
 #
@@ -13,6 +14,25 @@
 
 #################### DO NOT CHANGE ANYTHING BELOW THIS LINE ####################
 
+# NOTE: All three vars must be set or we set all to zero!
+ifndef	NITROS9VERSION
+NITROS9VERSION	= 0
+NITROS9MAJOR	= 0
+NITROS9MINOR	= 0
+endif
+ifndef	NITROS9MAJOR
+NITROS9VERSION	= 0
+NITROS9MAJOR	= 0
+NITROS9MINOR	= 0
+endif
+ifndef	NITROS9MINOR
+NITROS9VERSION	= 0
+NITROS9MAJOR	= 0
+NITROS9MINOR	= 0
+endif
+
+NITROS9VER	= v0$(NITROS9VERSION)0$(NITROS9MAJOR)0$(NITROS9MINOR)
+
 ifndef	NITROS9DIR
 NITROS9DIR	= $(HOME)/nitros9
 endif
--- a/scripts/bundi	Sat Apr 09 01:54:24 2005 +0000
+++ b/scripts/bundi	Sat Apr 09 16:11:11 2005 +0000
@@ -53,6 +53,9 @@
 echo "Step 1 - Format the disk and make the boot disk"
 os9 format -qe -l$os9_sectors tmp.dsk
 ./$1>&/dev/null
+os9 gen -b=bootfile -t=boottrack tmp.dsk>&/dev/null
+os9 copy -o=0 $NITROS9DIR/6309l2/modules/sysgo_dd tmp.dsk,sysgo
+os9 attr tmp.dsk,sysgo -epepr
 os9 dsave -e $NITROS9DIR/6309l2/latest_80d.dsk, tmp.dsk, >&/dev/null
 os9 dsave -e $NITROS9DIR/3rdparty/packages/uucpbb/uucpbb21_6309.dsk, tmp.dsk, >&/dev/null
 os9 dsave -e $NITROS9DIR/3rdparty/packages/cc/cc.dsk, tmp.dsk, >&/dev/null