Mercurial > hg > Members > kono > nitros9-code

changeset 2746:20a6dfbe8982

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated makefile(s) to build becker boot disks for drivewire4 server related to KingsQuest1 and Goldrush.
author drencor-xeen
date Wed, 09 Jan 2013 13:34:05 -0600
parents 5ed3a13b3865
children 7aa39bea428b
files 3rdparty/packages/sierra/goldrush/makefile 3rdparty/packages/sierra/goldrush/tOC_dw3_becker.txt 3rdparty/packages/sierra/kingsquest1/makefile ChangeLog
diffstat 4 files changed, 102 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/goldrush/makefile	Wed Jan 09 12:07:42 2013 -0600
+++ b/3rdparty/packages/sierra/goldrush/makefile	Wed Jan 09 13:34:05 2013 -0600
@@ -8,11 +8,12 @@
 DEPENDS		= ./makefile
 
 DSKDW3		= goldrush_dw3.dsk
+DSKDW3BECKER	= goldrush_dw3_becker.dsk
 DISK_1_80D	= goldrush_d1_80d.dsk
 DISK_2_80D	= goldrush_d2_80d.dsk
 DISK_3_80D	= goldrush_d3_80d.dsk
 
-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DSKDW3)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DSKDW3) $(DSKDW3BECKER)
 
 DISK_1_80D_NAME = "Gold Rush Disk 1"
 DISK_2_80D_NAME = "Gold Rush Disk 2"
@@ -25,6 +26,7 @@
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
 BOOTFILE_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
@@ -43,12 +45,22 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
 
+BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.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_dw3 $(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_D1	= ../startup tOC_80d.txt
 TEXTFILES_DW3	= ../startup tOC_dw3.txt
+TEXTFILES_DW3_BECKER	= ../startup tOC_dw3_becker.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.9 vol.10 vol.11 vol.12 words.tok
@@ -57,6 +69,10 @@
 
 SUPPORTFILES_D3	= object vol.0 vol.4 vol.5 vol.9 vol.11 vol.12
 
+SUPPORTFILES_ALL	= logDir object picDir sndDir viewDir vol.0 \
+		vol.1 vol.2 vol.3 vol.4 vol.5 vol.9 vol.10 \
+		vol.11 vol.12 words.tok
+
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
@@ -64,7 +80,7 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all $(DSKDW3) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+dsk:	all $(DSKDW3) $(DSKDW3BECKER) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
 
 $(DSKDW3):
 	$(RM) $@
@@ -84,21 +100,42 @@
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW3) $@,.
 	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
-	$(CP) $(SUPPORTFILES_D2) $@,.
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(CP) $(SUPPORTFILES_ALL) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DSKDW3BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $@ -n$(DSKDW3_NAME)
+	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW3_BECKER) $@,.
+	$(OS9RENAME) $@,tOC_dw3_becker.txt tOC.txt
+	$(CP) $(SUPPORTFILES_ALL) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 
 $(DISK_1_80D):
 	$(RM) $@
-	$(MOVE) toctmp tocgen
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME)
 	$(MERGE) $(BOOTFILE_80D)>os9boot
 	$(MERGE) $(KERNEL_FLOPPY)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
-	$(RM) os9boot_80d os9boot_80d kernel_1773
+	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
 	$(CP) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
@@ -110,8 +147,9 @@
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $@,.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 
 
 $(DISK_2_80D):
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/goldrush/tOC_dw3_becker.txt	Wed Jan 09 13:34:05 2013 -0600
@@ -0,0 +1,5 @@
+d1 s1 v0 v1 v9 v10 v11 v12
+d1 s1 v0 v2 v9 v10 v11
+d1 s1 v0 v3 v9 v11
+d1 s1 v0 v4 v9 v11
+d1 s1 v0 v5 v9 v11 v12
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Wed Jan 09 12:07:42 2013 -0600
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Wed Jan 09 13:34:05 2013 -0600
@@ -9,8 +9,9 @@
 
 DISK_40D	= kingsquest1_40d.dsk
 DSKDW3		= kingsquest1_dw3.dsk
+DSKDW3BECKER	= kingsquest1_dw3_becker.dsk
 
-DSKS		= $(DISK_40D) $(DSKDW3)
+DSKS		= $(DISK_40D) $(DSKDW3) $(DSKDW3BECKER)
 
 DISK_40D_NAME	= "King's Quest I"
 DSKDW3_NAME	= $(DISK_40D_NAME)
@@ -21,6 +22,7 @@
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
 
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -40,6 +42,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
 
+BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.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_dw3 $(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
@@ -56,7 +67,7 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all $(DISK_40D) $(DSKDW3)
+dsk:	all $(DISK_40D) $(DSKDW3) $(DSKDW3BECKER)
 
 $(DISK_40D):
 	$(RM) $@
@@ -99,8 +110,32 @@
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.
+
+$(DSKDW3BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $@ -n$(DISK_40D_NAME)
+	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
 dskcopy: dsk
--- a/ChangeLog	Wed Jan 09 12:07:42 2013 -0600
+++ b/ChangeLog	Wed Jan 09 13:34:05 2013 -0600
@@ -3,6 +3,19 @@
 ----------------------------------------------------------
 2013/01/09 David Ladd
 M ChangeLog
+M 3rdparty/packages/sierra/goldrush/makefile
+A 3rdparty/packages/sierra/goldrush/tOC_dw3_becker.txt
+M 3rdparty/packages/sierra/kingsquest1/makefile
+
+Added 3rdparty/packages/sierra/goldrush/tOC_dw3_becker.txt
+
+Updated 3rdparty/packages/sierra/goldrush/makefile and 
+3rdparty/packages/sierra/kingsquest1/makefile to now also create
+the becker disks for use with drivewire4 server.
+
+----------------------------------------------------------
+2013/01/09 David Ladd
+M ChangeLog
 M 3rdparty/packages/blackcauldron/makefile
 M 3rdparty/packages/christmas86/makefile