Mercurial > hg > Members > kono > nitros9-code

changeset 558:0ff357df35c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified : to ,
author boisy
date Wed, 30 Oct 2002 22:59:55 +0000
parents 7d803625ead8
children 33f12fe91048
files 3rdparty/packages/basic09/makefile 3rdparty/packages/multivue/makefile level1/makefile level2/makefile
diffstat 4 files changed, 60 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/basic09/makefile	Tue Oct 22 19:13:01 2002 +0000
+++ b/3rdparty/packages/basic09/makefile	Wed Oct 30 22:59:55 2002 +0000
@@ -44,9 +44,9 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(OS9FORMAT) $(DISK) -n"Basic09"
-	$(MAKDIR) $(DISK):CMDS
-	$(CP) $(ALLOBJS) $(DISK):CMDS
-	$(CP) $(TXTFILES) $(DISK):.
+	$(MAKDIR) $(DISK),CMDS
+	$(CP) $(ALLOBJS) $(DISK),CMDS
+	$(CP) $(TXTFILES) $(DISK),.
 
 dskclean:
 	-$(RM) $(DISK)
--- a/3rdparty/packages/multivue/makefile	Tue Oct 22 19:13:01 2002 +0000
+++ b/3rdparty/packages/multivue/makefile	Wed Oct 30 22:59:55 2002 +0000
@@ -26,14 +26,14 @@
 dsk:	all
 	$(RM) $(DISK)
 	$(OS9FORMAT) $(DISK) -n"Multi-Vue"
-	$(MAKDIR) $(DISK):CMDS
-	$(MAKDIR) $(DISK):CMDS/ICONS
-	$(MAKDIR) $(DISK):SYS
-	$(MAKDIR) $(DISK):DEMO
-	$(CD) CMDS; $(CP) $(CMDS) ../$(DISK):CMDS
-	$(CD) CMDS/ICONS; $(CP) $(ICONS) ../../$(DISK):CMDS/ICONS
-	$(CD) SYS; $(CP) $(SYS) ../$(DISK):SYS
-	$(CD) DEMO; $(CP) $(DEMO) ../$(DISK):DEMO
+	$(MAKDIR) $(DISK),CMDS
+	$(MAKDIR) $(DISK),CMDS/ICONS
+	$(MAKDIR) $(DISK),SYS
+	$(MAKDIR) $(DISK),DEMO
+	$(CD) CMDS; $(CP) $(CMDS) ../$(DISK),CMDS
+	$(CD) CMDS/ICONS; $(CP) $(ICONS) ../../$(DISK),CMDS/ICONS
+	$(CD) SYS; $(CP) $(SYS) ../$(DISK),SYS
+	$(CD) DEMO; $(CP) $(DEMO) ../$(DISK),DEMO
 
 dskclean:
 	-$(RM) $(DISK)
--- a/level1/makefile	Tue Oct 22 19:13:01 2002 +0000
+++ b/level1/makefile	Wed Oct 30 22:59:55 2002 +0000
@@ -1,6 +1,6 @@
 include ../Makefile.rules
 
-RELEASE		= os9l1v020100ccbeta2
+RELEASE		= os9l1v020100cc
 BOOTFILE	= bootfile_stock
 KERNEL		= kernel_stock
 
@@ -12,17 +12,14 @@
 ROOTFILES	= startup
 
 PACKAGENAME	= $(RELEASE).zip
-DSK_SS40_1	= $(RELEASE)_ss40_1.dsk
-DSK_SS40_2	= $(RELEASE)_ss40_2.dsk
-DSK_SS40_3	= $(RELEASE)_ss40_3.dsk
-DSK_DS40	= $(RELEASE)_ds40.dsk
+DSK_DS40_1	= $(RELEASE)_ds40_1.dsk
+DSK_DS40_2	= $(RELEASE)_ds40_2.dsk
 
 # Make all components
 all:
 	@$(ECHO) "*********************************************"
 	@$(ECHO) "*                                           *"
 	@$(ECHO) "*        OS-9 Level One Distribution        *"
-	@$(ECHO) "*        (C) 1983  Tandy Corporation        *"
 	@$(ECHO) "*                                           *"
 	@$(ECHO) "*********************************************"
 	$(CD) CMDS; make
@@ -43,50 +40,26 @@
 	-$(OS92UNIX) $(ROOTFILES)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK_SS40_1) $(DSK_SS40_2) $(DSK_SS40_3) $(DSK_DS40)
+	-$(RM) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2)
 
 dsk: all $(PACKAGENAME)
 
-$(PACKAGENAME): $(DSK_SS40_1) $(DSK_SS40_2) $(DSK_SS40_3) $(DSK_DS40)
-	$(ZIP) $(PACKAGENAME) $(DSK_SS40_1) $(DSK_SS40_2) $(DSK_SS40_3) $(DSK_DS40) ReleaseNotes ChangeLog
-
-$(DSK_SS40_1):
-	$(RM) $(DSK_SS40_1)
-	$(OS9FORMAT) $(DSK_SS40_1) -t40 -h1 -n"OS-9 Level One System Disk"
-	$(OS9GEN) $(DSK_SS40_1) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
-	$(MAKDIR) $(DSK_SS40_1):CMDS
-	$(MAKDIR) $(DSK_SS40_1):SYS
-	$(CD) CMDS; $(CP) $(CMDS_D1) ../$(DSK_SS40_1):CMDS
-	$(CD) SYS; $(CP) $(SYS) ../$(DSK_SS40_1):SYS
-	$(CP) $(ROOTFILES) $(DSK_SS40_1):.
-
-$(DSK_SS40_2):
-	-$(RM) $(DSK_SS40_2)
-	$(OS9FORMAT) $(DSK_SS40_2) -t40 -h1 -n"OS-9 Level One Modules Disk"
-	$(MAKDIR) $(DSK_SS40_2):CMDS
-	$(MAKDIR) $(DSK_SS40_2):MODULES
-	$(CD) CMDS; $(CP) $(CMDS_D2) ../$(DSK_SS40_2):CMDS
-	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK_SS40_2):MODULES
+$(PACKAGENAME): $(DSK_DS40_1) $(DSK_DS40_2)
+	$(ZIP) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2) ReleaseNotes ChangeLog
 
-$(DSK_SS40_3):
-	-$(RM) $(DSK_SS40_3)
-	$(OS9FORMAT) $(DSK_SS40_3) -t40 -h1 -n"OS-9 Level One Defs Disk"
-	$(MAKDIR) $(DSK_SS40_3):DEFS
-	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_SS40_3):DEFS
-
+$(DSK_DS40_1):
+	$(RM) $(DSK_DS40_1)
+	$(OS9FORMAT) $(DSK_DS40_1) -t40 -h1 -n"OS-9 Level One System Disk"
+	$(OS9GEN) $(DSK_DS40_1) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
+	$(MAKDIR) $(DSK_DS40_1),CMDS
+	$(MAKDIR) $(DSK_DS40_1),SYS
+	$(CD) CMDS; $(CP) $(CMDS_D1) $(CMDS_D2) ../$(DSK_DS40_1),CMDS
+	$(CD) SYS; $(CP) $(SYS) ../$(DSK_DS40_1),SYS
+	$(CP) $(ROOTFILES) $(DSK_DS40_1),.
 
-$(DSK_DS40):
-	-$(RM) $(DSK_DS40)
-	$(OS9FORMAT) $(DSK_DS40) -t40 -h2 -n"OS-9 Level One"
-	$(OS9GEN) $(DSK_DS40) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
-	$(MAKDIR) $(DSK_DS40):CMDS
-	$(MAKDIR) $(DSK_DS40):SYS
-	$(MAKDIR) $(DSK_DS40):MODULES
-	$(MAKDIR) $(DSK_DS40):DEFS
-	$(CD) CMDS; $(CP) $(CMDS_D1) ../$(DSK_DS40):CMDS
-	$(CD) CMDS; $(CP) $(CMDS_D2) ../$(DSK_DS40):CMDS
-	$(CD) SYS; $(CP) $(SYS) ../$(DSK_DS40):SYS
-	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK_DS40):MODULES
-	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_DS40):DEFS
-	$(CP) $(ROOTFILES) $(DSK_DS40):.
+$(DSK_DS40_2):
+	-$(RM) $(DSK_DS40_2)
+	$(OS9FORMAT) $(DSK_DS40_2) -t40 -h1 -n"OS-9 Level One Development Disk"
+	$(MAKDIR) $(DSK_DS40_2),DEFS
+	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_DS40_2),DEFS
 
--- a/level2/makefile	Tue Oct 22 19:13:01 2002 +0000
+++ b/level2/makefile	Wed Oct 30 22:59:55 2002 +0000
@@ -14,6 +14,8 @@
 PACKAGENAME     = $(RELEASE).zip
 DSK_DS40_1      = $(RELEASE)_ds40_1.dsk
 DSK_DS40_2      = $(RELEASE)_ds40_2.dsk
+DSK_DS80	= $(RELEASE)_ds80.dsk
+TESTDSK		= test.dsk
 
 
 # Make all components
@@ -42,30 +44,44 @@
 	-$(OS92UNIX) $(ROOTFILES)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2)
+	-$(RM) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2) $(DSK_DS80)
 
 dsk: all $(PACKAGENAME)
 
-$(PACKAGENAME): $(DSK_DS40_1) $(DSK_DS40_2)
-	$(ZIP) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2) ReleaseNotes ChangeLog
+$(PACKAGENAME): $(DSK_DS40_1) $(DSK_DS40_2) $(DSK_DS80)
+	$(ZIP) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2) $(DSK_DS80) ReleaseNotes ChangeLog
 
 $(DSK_DS40_1):
 	-$(RM) $(DSK_DS40_1)
 	$(OS9FORMAT) $(DSK_DS40_1) -t40 -h2 -n"OS-9 Level Two System Disk"
 	$(OS9GEN) $(DSK_DS40_1) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
-	$(MAKDIR) $(DSK_DS40_1):CMDS
-	$(MAKDIR) $(DSK_DS40_1):SYS
-	$(MAKDIR) $(DSK_DS40_1):MODULES
-	$(CP) $(SYSGO) $(DSK_DS40_1):CMDS
-	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_DS40_1):CMDS
-	$(CD) SYS; $(CP) $(SYS) ../$(DSK_DS40_1):SYS
-#	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK_DS40_1):MODULES
-	$(CP) $(ROOTFILES) $(DSK_DS40_1):.
+	$(MAKDIR) $(DSK_DS40_1),CMDS
+	$(MAKDIR) $(DSK_DS40_1),SYS
+	$(MAKDIR) $(DSK_DS40_1),MODULES
+	$(CP) $(SYSGO) $(DSK_DS40_1),CMDS
+	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_DS40_1),CMDS
+	$(CD) SYS; $(CP) $(SYS) ../$(DSK_DS40_1),SYS
+	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK_DS40_1),MODULES
+	$(CP) $(ROOTFILES) $(DSK_DS40_1),.
 
 $(DSK_DS40_2):
 	-$(RM) $(DSK_DS40_2)
 	$(OS9FORMAT) $(DSK_DS40_2) -t40 -h2 -n"OS-9 Level Two Development Disk"
-	$(MAKDIR) $(DSK_DS40_2):DEFS
-	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_DS40_2):DEFS
+	$(MAKDIR) $(DSK_DS40_2),DEFS
+	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_DS40_2),DEFS
 
+$(DSK_DS80):
+	-$(RM) $(DSK_DS80)
+	$(OS9FORMAT) $(DSK_DS80) -t80 -h2 -n"OS-9 Level Two System Disk"
+	$(OS9GEN) $(DSK_DS80) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
+	$(MAKDIR) $(DSK_DS80),CMDS
+	$(MAKDIR) $(DSK_DS80),SYS
+	$(MAKDIR) $(DSK_DS80),MODULES
+	$(MAKDIR) $(DSK_DS80),DEFS
+	$(CP) $(SYSGO) $(DSK_DS80),CMDS
+	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_DS80),CMDS
+	$(CD) SYS; $(CP) $(SYS) ../$(DSK_DS80),SYS
+	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK_DS80),MODULES
+	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_DS80),DEFS
+	$(CP) $(ROOTFILES) $(DSK_DS80),.