Mercurial > hg > Members > kono > nitros9-code

changeset 2265:581d99904cc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
makefiles updated
author boisy
date Mon, 28 Dec 2009 01:29:05 +0000
parents 2c15248c8542
children ee5b80844780
files level2/coco3_6309/bootfiles/makefile level2/coco3_6309/cmds/makefile level2/coco3_6309/makefile
diffstat 3 files changed, 41 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3_6309/bootfiles/makefile	Sun Dec 27 19:32:06 2009 +0000
+++ b/level2/coco3_6309/bootfiles/makefile	Mon Dec 28 01:29:05 2009 +0000
@@ -16,7 +16,6 @@
 		$(MD)/rbf.mn \
 		$(MD)/rbdw3.dr $(MD)/dw3.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
-		$(MD)/rammer.dr $(MD)/r0_96k.dd \
 		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/d2_40d.dd $(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -34,12 +33,16 @@
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
 # minimum bootfile without graphics console support
-BOOTFILE_DW3_MIN	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW3_SERVER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw3.dr $(MD)/dw3.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
-		$(MD)/scdwt.dr $(MD)/term_scdwt.dt \
+		$(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/cowin.io $(MD)/covdg.io \
+		$(MD)/term_win80.dt \
+		$(MD)/scdwt.dr $(MD)/t0_scdwt.dd \
                 $(MD)/t1_scdwt.dd $(MD)/t2_scdwt.dd $(MD)/t3_scdwt.dd \
                 $(MD)/t4_scdwt.dd $(MD)/t5_scdwt.dd $(MD)/t6_scdwt.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
@@ -99,7 +102,7 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft
 
-BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw3 bootfile_dw3_min
+BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw3 bootfile_dw3_server
 KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw3
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
@@ -122,8 +125,8 @@
 bootfile_dw3: $(BOOTFILE_DW3) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_DW3)>$@
 
-bootfile_dw3_min: $(BOOTFILE_DW3_MIN) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3_MIN)>$@
+bootfile_dw3_server: $(BOOTFILE_DW3_SERVER) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_DW3_SERVER)>$@
 
 # Kernels
 kernel_1773: $(KERNEL_1773) $(DEPENDS)
--- a/level2/coco3_6309/cmds/makefile	Sun Dec 27 19:32:06 2009 +0000
+++ b/level2/coco3_6309/cmds/makefile	Mon Dec 28 01:29:05 2009 +0000
@@ -17,7 +17,9 @@
 CMDS_D2         = basic09 runb gfx2 gfx inkey syscall copy del echo format \
                 merge os9gen prompt tmode
 
-CMDS_DW         = dw ftp wget
+CMDS_DW         = $(CMDS) $(CMDS_D2) dw ftp wget
+
+CMDS_DW_SERVER  = echo grfdrv link load login shell touch tsmon utilpak1
 
 SHELLMODS	= shellplus date deiniz echo iniz link load save unlink
 UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
@@ -69,5 +71,8 @@
 showobjs_dw:
 	@$(ECHO) $(CMDS_DW)
 
+showobjs_dw_server:
+	@$(ECHO) $(CMDS_DW_SERVER)
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
--- a/level2/coco3_6309/makefile	Sun Dec 27 19:32:06 2009 +0000
+++ b/level2/coco3_6309/makefile	Mon Dec 28 01:29:05 2009 +0000
@@ -8,7 +8,7 @@
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
 BOOTFILE_DW3	= bootfiles/bootfile_dw3
-BOOTFILE_DW3_MIN	= bootfiles/bootfile_dw3_min
+BOOTFILE_DW3_SERVER	= bootfiles/bootfile_dw3_server
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
 BOOTFILE_40D_50HZ	= bootfiles/bootfile_40d_50hz
@@ -21,6 +21,7 @@
 CMDS		= $(shell $(CD) cmds; make showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
 CMDS_DW		= $(shell $(CD) cmds; make showobjs_dw)
+CMDS_DW_SERVER	= $(shell $(CD) cmds; make showobjs_dw_server)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
 SYSMODS		= $(shell $(CD) modules; make showsysmods)
@@ -33,15 +34,15 @@
 DEFS		= $(shell $(CD) defs; make showobjs)
 SYSBIN		= $(shell $(CD) sys; make showbinobjs)
 SYSTEXT		= $(shell $(CD) sys; make showtextobjs)
-ROOTFILES	= startup
-ROOTFILES_DW	= $(ROOTFILES) ../coco3/startup.dw
+STARTUP		= startup
+STARTUP_DW_SERVER	= startup.dwserver
 SYSGO		= sysgo_dd
 
 PACKAGENAME	= $(DISTROVER).zip
 DSKDW3		= $(DISTROVER)_dw3.dsk
 LDSKDW3		= $(DISTRONAME)_dw3.dsk
-DSKDW3_MIN	= $(DISTROVER)_dw3_min.dsk
-LDSKDW3_MIN	= $(DISTRONAME)_dw3_min.dsk
+DSKDW3_SERVER	= $(DISTROVER)_dw3_server.dsk
+LDSKDW3_SERVER	= $(DISTRONAME)_dw3_server.dsk
 DSK360K_1	= $(DISTROVER)_40d_1.dsk
 LDSK360K_1	= $(DISTRONAME)_40d_1.dsk
 DSK360K_1_50HZ	= $(DISTROVER)_40d_1_50hz.dsk
@@ -54,8 +55,8 @@
 LDSK720K_50HZ	= $(DISTRONAME)_80d_50hz.dsk
 TESTDSK		= test.dsk
 
-DSKS		= $(DSKDW3) $(DSKDW3_MIN) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
-LDSKS		= $(LDSKDW3) $(LDSKDW3_MIN) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
+DSKS		= $(DSKDW3) $(DSKDW3_SERVER) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+LDSKS		= $(LDSKDW3) $(LDSKDW3_SERVER) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
 
 # Make all components
 all:
@@ -93,10 +94,6 @@
 	$(MAKDIR) $@,DEFS
 	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
@@ -105,8 +102,8 @@
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES_DW) $@,.
-	$(foreach file, $(ROOTFILES_DW), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,.
+	$(foreach file, $(STARTUP), $(OS9ATTR_TEXT) $@,$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
@@ -141,62 +138,24 @@
 	$(RM) $(LDSKDW3)
 	$(SOFTLINK) $@ $(LDSKDW3)
 
-$(DSKDW3_MIN):
+$(DSKDW3_SERVER):
 	-$(RM) $@
 	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/$(CPU) Level 2"
-	$(OS9GEN) $@ -b=$(BOOTFILE_DW3_MIN) -t=$(KERNELFILE_DW3)
+	$(OS9GEN) $@ -b=$(BOOTFILE_DW3_SERVER) -t=$(KERNELFILE_DW3)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
-	$(MAKDIR) $@,DEFS
 	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
-	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_DW_SERVER) ../$@,CMDS
+	$(foreach file, $(CMDS_DW_SERVER), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
-	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES_DW) $@,.
-	$(foreach file, $(ROOTFILES_DW), $(OS9ATTR_TEXT) $@,$(file);)
-	$(MAKDIR) $@,NITROS9
-	$(MAKDIR) $@,NITROS9/$(DISTRO)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
-	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
-	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
-	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
-	$(RM) $(LDSKDW3_MIN)
-	$(SOFTLINK) $@ $(LDSKDW3_MIN)
+	$(CPL) $(STARTUP_DW_SERVER) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(RM) $(LDSKDW3_SERVER)
+	$(SOFTLINK) $@ $(LDSKDW3_SERVER)
 
 $(DSK360K_1):
 	-$(RM) $@
@@ -215,8 +174,8 @@
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,.
+	$(foreach file, $(STARTUP), $(OS9ATTR_TEXT) $@,$(file);)
 	$(RM) $(LDSK360K_1)
 	$(SOFTLINK) $@ $(LDSK360K_1)
 
@@ -237,8 +196,8 @@
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,.
+	$(foreach file, $(STARTUP), $(OS9ATTR_TEXT) $@,$(file);)
 	$(RM) $(LDSK360K_1_50HZ)
 	$(SOFTLINK) $@ $(LDSK360K_1_50HZ)
 
@@ -301,8 +260,8 @@
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,.
+	$(foreach file, $(STARTUP), $(OS9ATTR_TEXT) $@,$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
@@ -356,8 +315,8 @@
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,.
+	$(foreach file, $(STARTUP), $(OS9ATTR_TEXT) $@,$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS