Mercurial > hg > Members > kono > nitros9-code

changeset 2192:36f6b076fd05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New dw3 format value for rules.mak, added christmas86 to sieraa build
author boisy
date Wed, 11 Mar 2009 10:20:58 +0000
parents d280490500a8
children 97391b69843d
files 3rdparty/packages/raakatu/makefile 3rdparty/packages/sierra/christmas86/defsfile 3rdparty/packages/sierra/christmas86/logDir 3rdparty/packages/sierra/christmas86/makefile 3rdparty/packages/sierra/christmas86/object 3rdparty/packages/sierra/christmas86/picDir 3rdparty/packages/sierra/christmas86/sndDir 3rdparty/packages/sierra/christmas86/tOC.txt 3rdparty/packages/sierra/christmas86/viewDir 3rdparty/packages/sierra/christmas86/vol.0 3rdparty/packages/sierra/christmas86/words.tok 3rdparty/packages/sierra/makefile 3rdparty/packages/sierra/policequest1/startup rules.mak
diffstat 14 files changed, 134 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/raakatu/makefile	Wed Mar 11 10:20:58 2009 +0000
@@ -0,0 +1,48 @@
+include ../../../rules.mak
+
+DEPENDS		= ./makefile
+
+DISK		= raakatu.dsk
+CMDS		= raaka-tu
+MD		= $(LEVEL2)/coco3/modules
+
+# We make our own bootfile and kernel track
+KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+OS9BOOT		= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
+SUPPORTFILES	= 
+
+ALLOBJS		= $(CMDS)
+
+all:	$(ALLOBJS)
+
+clean:	dskclean
+	$(RM) $(ALLOBJS)
+
+dsk:	all
+	$(RM) $(DISK)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS40) $(DISK) -n"Raaka-Tu"
+	$(MERGE) $(OS9BOOT)>os9boot
+	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773
+	$(RM) os9boot kernel_1773
+	$(MAKDIR) $(DISK),CMDS
+	$(CP) $(CMDS) $(DISK),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
+	$(OS9RENAME) $(DISK),CMDS/raaka-tu AutoEx
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $(DISK),CMDS/shell
+	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
+#	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),SUB/$(file);)
+
+dskcopy:
+	$(CP) $(DISK) $(DSKDIR)
+
+dskclean:
+	$(RM) $(DISK)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/christmas86/defsfile	Wed Mar 11 10:20:58 2009 +0000
@@ -0,0 +1,6 @@
+Level	equ	2
+
+	use	os9defs
+	use	scfdefs
+        use     systype
+        use     vtiodefs_cc3
Binary file 3rdparty/packages/sierra/christmas86/logDir has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/christmas86/makefile	Wed Mar 11 10:20:58 2009 +0000
@@ -0,0 +1,66 @@
+include $(NITROS9DIR)/rules.mak
+
+vpath %.asm ../objs_lsl
+
+DEPENDS		= ./makefile
+
+DISK_40D	= christmas86.dsk
+
+DISK_40D_NAME	= "Christmas 1986"
+
+CMDS		= sierra mnln scrn shdw tocgen
+MD		= $(LEVEL2)/coco3/modules
+
+# We make our own bootfile and kernel track
+KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+
+OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
+BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
+		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
+		$(LEVEL2)/coco3/cmds/setime
+
+TEXTFILES	= startup tOC.txt
+
+SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 words.tok
+
+ALLOBJS		= $(CMDS)
+
+all:	$(ALLOBJS)
+
+clean:	dskclean
+	$(RM) $(ALLOBJS)
+
+dsk:	all
+	$(RM) $(DISK_40D) $(DISK_2_40D)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DS40) -q $(DISK_40D) -n$(DISK_40D_NAME)
+	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
+	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
+	$(MERGE) $(KERNEL)>kernel_1773
+	$(OS9GEN) $(DISK_40D) -b=os9boot_40d -t=kernel_1773
+	$(RM) os9boot_40d kernel_1773
+	$(MAKDIR) $(DISK_40D),CMDS
+	$(CP) $(CMDS) $(DISK_40D),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_40D),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DISK_40D),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DISK_40D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_40D),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DISK_40D),.
+	tocgen $(DISK_40D),tOC.txt $(DISK_40D),tOC
+	$(CP) $(SUPPORTFILES) $(DISK_40D),.
+
+dskcopy: dsk
+	$(CP) $(DISK_40D) $(DSKDIR)
+
+dskclean:
+	$(RM) $(DISK_40D)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/christmas86/object	Wed Mar 11 10:20:58 2009 +0000
@@ -0,0 +1,1 @@
+Bvxp DJr
\ No newline at end of file
Binary file 3rdparty/packages/sierra/christmas86/picDir has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/christmas86/sndDir	Wed Mar 11 10:20:58 2009 +0000
@@ -0,0 +1,1 @@
+ÿÿÿb+cfCielWm¥q[sÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿtt)tûu	uÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿvAÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿvË|
ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/christmas86/tOC.txt	Wed Mar 11 10:20:58 2009 +0000
@@ -0,0 +1,1 @@
+d1 s1 v0
Binary file 3rdparty/packages/sierra/christmas86/viewDir has changed
Binary file 3rdparty/packages/sierra/christmas86/vol.0 has changed
Binary file 3rdparty/packages/sierra/christmas86/words.tok has changed
--- a/3rdparty/packages/sierra/makefile	Wed Mar 11 02:36:56 2009 +0000
+++ b/3rdparty/packages/sierra/makefile	Wed Mar 11 10:20:58 2009 +0000
@@ -1,6 +1,6 @@
 include $(NITROS9DIR)/rules.mak
 
-dirs	= blackcauldron goldrush \
+dirs	= blackcauldron christmas86 goldrush \
 	kingsquest1 kingsquest2 kingsquest3 kingsquest4 \
 	leisuresuitlarry manhunter1 manhunter2 \
 	policequest1 spacequest0 spacequest1 spacequest2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/policequest1/startup	Wed Mar 11 10:20:58 2009 +0000
@@ -0,0 +1,8 @@
+* Echo welcome message
+echo * Sierra welcomes you to the *
+echo * world of 3-D adventuring.  *
+* Lock shell and std utils into memory
+link shell
+* Start system time from keyboard
+setime </1
+date -t
--- a/rules.mak	Wed Mar 11 02:36:56 2009 +0000
+++ b/rules.mak	Wed Mar 11 10:20:58 2009 +0000
@@ -76,7 +76,8 @@
 OS9FORMAT_DS40	= os9 format -t40 -ds -dd
 OS9FORMAT_DS80	= os9 format -t80 -ds -dd
 # DriveWire 3 format: 4096 256byte sectors (1,048,576 bytes)
-OS9FORMAT_DW3	= os9 format -l4096
+#OS9FORMAT_DW3	= os9 format -l4096
+OS9FORMAT_DW3	= os9 format -t256 -ss -dd
 OS9GEN		= os9 gen
 OS9RENAME	= os9 rename
 OS9ATTR		= os9 attr -q