changeset 1126:85eed1cde1b7

attr used throughout the makefiles now
author boisy
date Sun, 13 Apr 2003 23:42:51 +0000
parents 17abff098c6d
children 9a5c6b78fad2
files 3rdparty/packages/basic09/makefile 3rdparty/packages/cc/makefile 3rdparty/packages/fsim2/makefile 3rdparty/packages/koronis/makefile 3rdparty/packages/kyumgai/makefile 3rdparty/packages/mm/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/multivue/sys/makefile 3rdparty/packages/rof/makefile 3rdparty/packages/sierra/kingsquest3/defsfile 3rdparty/packages/sierra/leisuresuitlarry/makefile 3rdparty/packages/subsim/makefile level1/makefile level2/makefile rules.mak
diffstat 15 files changed, 58 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/basic09/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/basic09/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -41,8 +41,9 @@
 	$(OS9FORMAT_SS35) $(DISK) -n"Basic09"
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(ALLOBJS) $(DISK),CMDS
-	$(foreach file, $(ALLOBJS), $(OS9ATTR) $(DISK),CMDS/$(file) -epepr;)
+	$(foreach file, $(ALLOBJS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(CPL) $(TXTFILES) $(DISK),.
+	$(foreach file, $(TXTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
 
 dskclean:
 	-$(RM) $(DISK)
--- a/3rdparty/packages/cc/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/cc/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -27,7 +27,7 @@
 	$(MAKDIR) $(DISK),SOURCES
 	$(MAKDIR) $(DISK),SOURCES/SYS
 	$(CP) $(CMDS) $(DISK),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR) $(DISK),CMDS/$(file) -epe -pr;)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(CPL) DEFS/*.h $(DISK),DEFS
 	$(CP) LIB/*.l LIB/*.r $(DISK),LIB
 	$(CPL) SOURCES/*.c $(DISK),SOURCES
--- a/3rdparty/packages/fsim2/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/fsim2/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -37,10 +37,12 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(LEVEL2)/CMDS/shell_21 $(DISK),CMDS/shell
+	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
 	$(CP) $(CMDS) $(DISK),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR) $(DISK),CMDS/$(file) -epe -pr;)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(OS9RENAME) $(DISK),CMDS/fs AutoEx
 	$(CP) $(SUPPORTFILES) $(DISK),.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
 
 dskcopy: dsk
 	$(CP) $(DISK) $(DSKDIR)
--- a/3rdparty/packages/koronis/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/koronis/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -40,9 +40,12 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(LEVEL2)/CMDS/shell_21 $(DISK),CMDS/shell
+	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
 	$(CP) $(CMDS) $(DISK),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(OS9RENAME) $(DISK),CMDS/koronis AutoEx
 	$(CP) $(SUPPORTFILES) $(DISK),.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
 
 dskcopy: dsk
 	$(CP) $(DISK) $(DSKDIR)
--- a/3rdparty/packages/kyumgai/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/kyumgai/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -42,9 +42,12 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(LEVEL2)/CMDS/shell_21 $(DISK),CMDS/shell
+	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
 	$(CP) $(CMDS) $(DISK),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(OS9RENAME) $(DISK),CMDS/ninja AutoEx
 	$(CP) $(SUPPORTFILES) $(DISK),.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
 
 dskcopy: dsk
 	$(CP) $(DISK) $(DSKDIR)
--- a/3rdparty/packages/mm/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/mm/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -37,9 +37,12 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(LEVEL2)/CMDS/shell_21 $(DISK),CMDS/shell
+	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
 	$(CP) $(CMDS) $(DISK),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(OS9RENAME) $(DISK),CMDS/mm AutoEx
 	$(CP) $(SUPPORTFILES) $(DISK),.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $(DISK),$(file);)
 
 dskcopy: dsk
 	$(CP) $(DISK) $(DSKDIR)
--- a/3rdparty/packages/multivue/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/multivue/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -32,10 +32,15 @@
 	$(MAKDIR) $(DISK),SYS
 	$(MAKDIR) $(DISK),DEMO
 	$(CD) CMDS; $(CP) $(CMDS) ../$(DISK),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(CD) CMDS/ICONS; $(CP) $(ICONS) ../../$(DISK),CMDS/ICONS
+	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $(DISK),CMDS/ICONS/$(file);)
 	$(CD) SYS; $(CP) $(SYSBIN) ../$(DISK),SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $(DISK),SYS/$(file);)
 	$(CD) SYS; $(CPL) $(SYSTEXT) ../$(DISK),SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $(DISK),SYS/$(file);)
 	$(CD) DEMO; $(CPL) $(DEMO) ../$(DISK),DEMO
+	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $(DISK),DEMO/$(file);)
 
 dskcopy: dsk
 	$(CP) $(DISK) $(DSKDIR)
--- a/3rdparty/packages/multivue/sys/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/multivue/sys/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -2,7 +2,7 @@
 
 DEPENDS		= ./Makefile
 
-SYSFILES	= LogBook env.file
+SYSFILES	= env.file
 HELPFILES	= cocopr.hp control.hp gcal.hp gcalc.hp gclock.hp gport.hp \
 		gprint.hp gshell.hp
 ASSETFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
--- a/3rdparty/packages/rof/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/rof/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -36,9 +36,12 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(LEVEL2)/CMDS/shell_21 $(DISK),CMDS/shell
+	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
 	$(CP) $(CMDS) $(DISK),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(OS9RENAME) $(DISK),CMDS/rescue AutoEx
 	$(CP) $(SUPPORTFILES) $(DISK),.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
 
 dskcopy: dsk
 	$(CP) $(DISK) $(DSKDIR)
--- a/3rdparty/packages/sierra/kingsquest3/defsfile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/sierra/kingsquest3/defsfile	Sun Apr 13 23:42:51 2003 +0000
@@ -2,3 +2,5 @@
 
 	use	os9defs
 	use	scfdefs
+        use     systype
+        use     releasedefs
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -38,8 +38,10 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(CMDS) $(DISK),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(OS9RENAME) $(DISK),CMDS/sierra AutoEx
 	$(CP) $(SUPPORTFILES) $(DISK),.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
 
 dskcopy: dsk
 	$(CP) $(DISK) $(DSKDIR)
--- a/3rdparty/packages/subsim/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/3rdparty/packages/subsim/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -38,9 +38,12 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
 	$(CP) $(CMDS) $(DISK),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(CP) $(LEVEL2)/CMDS/shell_21 $(DISK),CMDS/shell
+	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
 	$(OS9RENAME) $(DISK),CMDS/presub AutoEx
 	$(CP) $(SUPPORTFILES) $(DISK),.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
 
 dskcopy:
 	$(CP) $(DISK) $(DSKDIR)
--- a/level1/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/level1/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -54,15 +54,19 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(CD) CMDS; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR) $@,CMDS/$(file) -ewr -pepr;)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) SYS; $(CPL) $(SYS) ../$@,SYS
+	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(MAKDIR) $@,DEFS
 	$(CD) DEFS; $(CPL) $(DEFS) ../$@,DEFS
+	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK2):
 	$(RM) $@
 	$(OS9FORMAT_DS40) $@ -n"OS-9 Level One Modules Disk"
 	$(MAKDIR) $@,MODULES
 	$(CD) MODULES; $(CP) $(MODULES) ../$@,MODULES
+	$(foreach file, $(MODULES), $(OS9ATTR_EXEC) $@,MODULES/$(file);)
 
--- a/level2/makefile	Sun Apr 13 22:35:00 2003 +0000
+++ b/level2/makefile	Sun Apr 13 23:42:51 2003 +0000
@@ -54,22 +54,28 @@
 
 $(DSK1):
 	-$(RM) $(DSK1)
-	$(OS9FORMAT_DS40) -e $(DSK1) -n"OS-9 Level Two System Disk"
-	$(OS9GEN) $(DSK1) -b=BOOTFILES/$(BOOTFILE) -t=BOOTFILES/$(KERNEL)
-	$(MAKDIR) $(DSK1),CMDS
-	$(MAKDIR) $(DSK1),SYS
-	$(MAKDIR) $(DSK1),DEFS
-	$(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
-	$(CPL) $(ROOTFILES) $(DSK1),.
+	$(OS9FORMAT_DS40) -e $@ -n"OS-9 Level Two System Disk"
+	$(OS9GEN) $@ -b=BOOTFILES/$(BOOTFILE) -t=BOOTFILES/$(KERNEL)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(CP) MODULES/$(SYSGO) $@,
+	$(OS9ATTR_EXEC) $@,$(SYSGO)
+	$(CD) CMDS; $(CP) $(CMDS) ../$@,CMDS
+	$(foreach file, $(CMDS), $(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) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK2):
 	-$(RM) $(DSK2)
 	$(OS9FORMAT_DS40) -e $(DSK2) -n"OS-9 Level Two Modules Disk"
 	$(MAKDIR) $(DSK2),MODULES
 	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK2),MODULES
+	$(foreach file, $(MODULES), $(OS9ATTR_EXEC) $@,MODULES/$(file);)
+
--- a/rules.mak	Sun Apr 13 22:35:00 2003 +0000
+++ b/rules.mak	Sun Apr 13 23:42:51 2003 +0000
@@ -42,7 +42,9 @@
 OS9FORMAT_DS80	= $(OS9TOOLSDIR)/os9 format -t80 -ds -dd -9
 OS9GEN		= $(OS9TOOLSDIR)/os9 gen
 OS9RENAME	= $(OS9TOOLSDIR)/os9 rename
-OS9ATTR		= $(OS9TOOLSDIR)/os9 attr
+OS9ATTR		= $(OS9TOOLSDIR)/os9 attr -q
+OS9ATTR_TEXT	= $(OS9ATTR) -npe -npw -pr -ne -w -r
+OS9ATTR_EXEC	= $(OS9ATTR) -pe -npw -pr -e -w -r
 PADROM		= $(OS9TOOLSDIR)/os9 padrom
 MOUNT		= sudo mount
 UMOUNT		= sudo umount