changeset 454:14157dc9e1d2

Major mods to Makefiles
author boisy
date Mon, 23 Sep 2002 03:07:44 +0000
parents 4240f093661c
children 22eef8cc6d07
files level1/makefile level1/modules/makefile
diffstat 2 files changed, 73 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Mon Sep 23 00:20:57 2002 +0000
+++ b/level1/makefile	Mon Sep 23 03:07:44 2002 +0000
@@ -1,6 +1,21 @@
 include ../Makefile.rules
 
-ROOTOBJS	= startup
+RELEASE		= os9l1v020100ccbeta2
+BOOTFILE	= bootfile_1773
+KERNEL		= kernel_1773
+
+CMDS_D1		= $(shell $(CD) CMDS; make showcocoobjs_d1)
+CMDS_D2		= $(shell $(CD) CMDS; make showcocoobjs_d2)
+MODULES		= $(shell $(CD) MODULES; make showcopyobjs)
+SYS		= $(shell $(CD) SYS; make showobjs)
+DEFS		= $(shell $(CD) DEFS; make showobjs)
+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
 
 # Make all components
 all:
@@ -12,18 +27,66 @@
 	@$(ECHO) "*********************************************"
 	$(CD) CMDS; make
 	$(CD) MODULES; make
-	$(CD) BOOTFILES; make
 	$(CD) DEFS; make
 	$(CD) SYS; make
-	$(UNIX2OS9) $(ROOTOBJS)
-	$(CHMOD) 644 $(ROOTOBJS)
+	$(CD) BOOTFILES; make
+	$(UNIX2OS9) $(ROOTFILES)
+	$(CHMOD) 644 $(ROOTFILES)
 
 # Clean all components
-clean:
+clean:	dskclean
 	-$(CD) CMDS; make clean
 	-$(CD) MODULES; make clean
-	-$(CD) BOOTFILES; make clean
 	-$(CD) DEFS; make clean
 	-$(CD) SYS; make clean
-	-$(OS92UNIX) $(ROOTOBJS)
+	-$(CD) BOOTFILES; make clean
+	-$(OS92UNIX) $(ROOTFILES)
+
+dskclean:
+	-$(RM) $(PACKAGENAME) $(DSK_SS40_1) $(DSK_SS40_2) $(DSK_SS40_3) $(DSK_DS40)
+
+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
+
+$(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
+
+$(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):
+	-$(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):.
+
--- a/level1/modules/makefile	Mon Sep 23 00:20:57 2002 +0000
+++ b/level1/modules/makefile	Mon Sep 23 03:07:44 2002 +0000
@@ -18,9 +18,9 @@
 		ddd0_80d.dd d0_80d.dd d1_80d.dd d2_80d.dd \
 		h0_15.dd h1_15.dd h0_35.dd h1_35.dd \
 		m1.dd m2.dd nil.dd p.dd pipe.dd ssc.dd \
-		term_t1.dd t1.dd t2.dd t3.dd term32.dd term80.dd \
-		p1_d64.dd term_d64.dd t1_d64.dd \
-		dd_d64.dd d0_d64.dd d1_d64.dd d2_d64.dd d3_d64.dd
+		term_t1.dd t1.dd t2.dd t3.dd term32.dd term80.dd
+#		p1_d64.dd term_d64.dd t1_d64.dd \
+#		dd_d64.dd d0_d64.dd d1_d64.dd d2_d64.dd d3_d64.dd
 HELP		= co32.hp co80.hp \
 		ddd0_35s.hp d0_35s.hp d1_35s.hp d2_35s.hp d3_35s.hp \
 		ddd0_40d.hp d0_40d.hp d1_40d.hp d2_40d.hp \