Mercurial > hg > Members > kono > nitros9-code

changeset 1122:99b993d4c94e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified to use attr
author boisy
date Sun, 13 Apr 2003 22:18:49 +0000
parents 6a058c03adb1
children 358aeaeedea9
files level1/makefile level2/makefile
diffstat 2 files changed, 21 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Sat Apr 12 17:32:17 2003 +0000
+++ b/level1/makefile	Sun Apr 13 22:18:49 2003 +0000
@@ -45,23 +45,24 @@
 	$(CP) $(DSK1) $(DSK2) $(PACKAGENAME) $(DSKDIR)
 
 $(PACKAGENAME): $(DSK1) $(DSK2)
-	$(ZIP) $(PACKAGENAME) $(DSK1) $(DSK2) ReadMe ChangeLog
+	$(ARCHIVE) $(PACKAGENAME) $(DSK1) $(DSK2) ReadMe ChangeLog
 
 $(DSK1):
-	$(RM) $(DSK1)
-	$(OS9FORMAT_DS40) $(DSK1) -n"OS-9 Level One System Disk"
-	$(OS9GEN) $(DSK1) -b=BOOTFILES/$(BOOTFILE) -t=BOOTFILES/$(KERNEL)
-	$(MAKDIR) $(DSK1),CMDS
-	$(MAKDIR) $(DSK1),SYS
-	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK1),CMDS
-	$(CD) SYS; $(CPL) $(SYS) ../$(DSK1),SYS
-	$(MAKDIR) $(DSK1),DEFS
-	$(CD) DEFS; $(CPL) $(DEFS) ../$(DSK1),DEFS
-	$(CPL) $(ROOTFILES) $(DSK1),.
+	$(RM) $@
+	$(OS9FORMAT_DS40) $@ -n"OS-9 Level One System Disk"
+	$(OS9GEN) $@ -b=BOOTFILES/$(BOOTFILE) -t=BOOTFILES/$(KERNEL)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(CD) CMDS; $(CP) $(CMDS) ../$@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR) $@,CMDS/$(file) -ewr -pepr;)
+	$(CD) SYS; $(CPL) $(SYS) ../$@,SYS
+	$(MAKDIR) $@,DEFS
+	$(CD) DEFS; $(CPL) $(DEFS) ../$@,DEFS
+	$(CPL) $(ROOTFILES) $@,.
 
 $(DSK2):
-	$(RM) $(DSK2)
-	$(OS9FORMAT_DS40) $(DSK2) -n"OS-9 Level One Modules Disk"
-	$(MAKDIR) $(DSK2),MODULES
-	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK2),MODULES
+	$(RM) $@
+	$(OS9FORMAT_DS40) $@ -n"OS-9 Level One Modules Disk"
+	$(MAKDIR) $@,MODULES
+	$(CD) MODULES; $(CP) $(MODULES) ../$@,MODULES
 
--- a/level2/makefile	Sat Apr 12 17:32:17 2003 +0000
+++ b/level2/makefile	Sun Apr 13 22:18:49 2003 +0000
@@ -10,7 +10,7 @@
 SYSBIN		= $(shell $(CD) SYS; make showbinobjs)
 SYSTEXT		= $(shell $(CD) SYS; make showtextobjs)
 ROOTFILES	= startup upgrade_song
-SYSGO		= MODULES/cc3go
+SYSGO		= cc3go
 
 PACKAGENAME	= $(RELEASE).zip
 DSK1		= $(RELEASE)_ds40_1.dsk
@@ -50,7 +50,7 @@
 	$(CP) $(DSK1) $(DSK2) $(PACKAGENAME) $(DSKDIR)
 
 $(PACKAGENAME): $(DSK1) $(DSK2)
-	$(ZIP) $(PACKAGENAME) $(DSK1) $(DSK2) ReadMe ChangeLog
+	$(ARCHIVE) $(PACKAGENAME) $(DSK1) $(DSK2) ReadMe ChangeLog
 
 $(DSK1):
 	-$(RM) $(DSK1)
@@ -59,8 +59,10 @@
 	$(MAKDIR) $(DSK1),CMDS
 	$(MAKDIR) $(DSK1),SYS
 	$(MAKDIR) $(DSK1),DEFS
-	$(CP) $(SYSGO) $(DSK1),
+	$(CP) MODULES/$(SYSGO) $(DSK1),
+	$(OS9ATTR) $@,$(SYSGO) -ewr -pepr
 	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK1),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR) $@,CMDS/$(file) -ewr -pepr;)
 	$(CD) SYS; $(CP) $(SYSBIN) ../$(DSK1),SYS
 	$(CD) SYS; $(CPL) $(SYSTEXT) ../$(DSK1),SYS
 	$(CD) DEFS; $(CPL) $(DEFS) ../$(DSK1),DEFS