Mercurial > hg > Members > kono > nitros9-code

changeset 1730:a28e465269b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Files from Phill
author boisy
date Wed, 17 Nov 2004 21:20:08 +0000
parents 7bdc60c48533
children 16a81c903c23
files level1/makefile level1/makefile.dalpha level1/makefile.dragon level1/startup.dalpha level1/startup.dragon
diffstat 5 files changed, 51 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Wed Nov 17 01:24:21 2004 +0000
+++ b/level1/makefile	Wed Nov 17 21:20:08 2004 +0000
@@ -1,6 +1,6 @@
 include ../rules.mak
 
-RELEASE		= nos96809l1v030204
+RELEASE		= nos96809l1v030205
 BOOTFILE	= bootfiles/bootfile
 BOOTFILE_DS80	= bootfiles/bootfile_ds80
 KERNELFILE	= bootfiles/kernel_1773
--- a/level1/makefile.dalpha	Wed Nov 17 01:24:21 2004 +0000
+++ b/level1/makefile.dalpha	Wed Nov 17 21:20:08 2004 +0000
@@ -5,24 +5,26 @@
 BOOTFILE_DS80	= bootfiles/bootfile_dalpha
 KERNELFILE	= bootfiles/kernel_dalpha
 DIRS		= cmds modules defs sys bootfiles
+DDIRS		= modules bootfiles
 
 # Specify which shell should be used
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
 CMDS		= $(shell $(CD) cmds; make showcocoobjs)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
+BOOTTRACK	= $(shell $(CD) modules; make -f makefile.dragon showboottrack)
+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)
+PIPE		= $(shell $(CD) modules; make -f makefile.dragon showpipe)
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
 SYS		= $(shell $(CD) sys; make showobjs)
 DEFS		= $(shell $(CD) defs; make showobjs)
-ROOTFILES	= startup
+ROOTFILES	= 
+STARTUP		= startup.dalpha
 
 PACKAGENAME	= $(RELEASE).zip
 DSK360K_1	= $(RELEASE)_ss80_1.dsk
@@ -38,10 +40,12 @@
 	@$(ECHO) "*                                                *"
 	@$(ECHO) "**************************************************"
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
-
+	$(foreach dir, $(DDIRS), ($(CD) $(dir); make -f makefile.dragon);)
+	
 # Clean all components
 clean:	dskclean
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
+	$(foreach dir, $(DDIRS), ($(CD) $(dir); make -f makefile.dragon clean);)
 
 dskclean:
 	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
@@ -75,6 +79,8 @@
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
 
 $(DSK360K_2):
 	$(RM) $@
@@ -128,6 +134,8 @@
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
--- a/level1/makefile.dragon	Wed Nov 17 01:24:21 2004 +0000
+++ b/level1/makefile.dragon	Wed Nov 17 21:20:08 2004 +0000
@@ -4,25 +4,27 @@
 BOOTFILE	= bootfiles/bootfile_d64
 BOOTFILE_DS80	= bootfiles/bootfile_d64
 KERNELFILE	= bootfiles/kernel_d64
-DIRS		= cmds modules defs sys bootfiles
+DIRS		= cmds defs sys modules bootfiles
+DDIRS		= modules bootfiles
 
 # Specify which shell should be used
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
 CMDS		= $(shell $(CD) cmds; make showcocoobjs)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
+BOOTTRACK	= $(shell $(CD) modules; make -f makefile.dragon showboottrack)
+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)
+PIPE		= $(shell $(CD) modules; make -f makefile.dragon showpipe)
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
-SYS		= $(shell $(CD) sys; make showobjs)
+SYS			= $(shell $(CD) sys; make showobjs)
 DEFS		= $(shell $(CD) defs; make showobjs)
-ROOTFILES	= startup
+ROOTFILES	= 
+STARTUP		= startup.dragon
 
 PACKAGENAME	= $(RELEASE).zip
 DSK360K_1	= $(RELEASE)_ds40_1.dsk
@@ -38,10 +40,12 @@
 	@$(ECHO) "*                                                *"
 	@$(ECHO) "**************************************************"
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
+	$(foreach dir, $(DDIRS), ($(CD) $(dir); make -f makefile.dragon);)
 
 # Clean all components
 clean:	dskclean
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
+	$(foreach dir, $(DDIRS), ($(CD) $(dir); make -f makefile.dragon clean);)
 
 dskclean:
 	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
@@ -73,6 +77,8 @@
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
 
 $(DSK360K_2):
 	$(RM) $@
@@ -126,6 +132,8 @@
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/startup.dalpha	Wed Nov 17 21:20:08 2004 +0000
@@ -0,0 +1,8 @@
+* Echo welcome message
+echo * Welcome to NitrOS-9 Level 1 *
+echo *    on the Dragon Alpha      *
+echo *                 Computer    *
+* Start system time from keyboard
+setime </term
+date -t
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/startup.dragon	Wed Nov 17 21:20:08 2004 +0000
@@ -0,0 +1,7 @@
+* Echo welcome message
+echo * Welcome to NitrOS-9 Level 1 *
+echo *   on the Dragon Computer    *
+* Start system time from keyboard
+setime </term
+date -t
+