# HG changeset patch # User drencor-xeen # Date 1357771905 21600 # Node ID 7aa39bea428b55aca66cc324887278aa8365ec1d # Parent 20a6dfbe8982c5393da89fa3bbfcb470ce5e7202 Fixed the tOC_80d.txt file related to manhunter1. Updated makefile(s) for kingsquest2, kingsquest3, kingsquest4, leisuresuitlarry, manhunter1, and manhunter2 so that becker boot disks for use with drivewire4 server are created. diff -r 20a6dfbe8982 -r 7aa39bea428b 3rdparty/packages/sierra/kingsquest2/makefile --- a/3rdparty/packages/sierra/kingsquest2/makefile Wed Jan 09 13:34:05 2013 -0600 +++ b/3rdparty/packages/sierra/kingsquest2/makefile Wed Jan 09 16:51:45 2013 -0600 @@ -10,9 +10,10 @@ DSK_1_40D = kingsquest2_d1_40d.dsk DSK_2_40D = kingsquest2_d2_40d.dsk DSK_80D = kingsquest2_80d.dsk -DSK_DW3 = kingsquest2_dw3.dsk +DSK_DW3 = kingsquest2_dw3.dsk +DSK_DW3_BECKER = kingsquest2_dw3_becker.dsk -DSKS = $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW3) +DSKS = $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW3) $(DSK_DW3_BECKER) DSK_1_40D_NAME = "King's Quest II Disk 1" DSK_2_40D_NAME = "King's Quest II Disk 2" @@ -24,7 +25,9 @@ # 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 = $(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 \ $(MD)/rb1773.dr $(MD)/ddd0_40d.dd \ @@ -43,7 +46,7 @@ $(MD)/vrn.dr $(MD)/vi.dd \ $(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd -BOOTFILE_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ +BOOTFILE_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \ $(MD)/scf.mn $(MD)/vtio.dr \ @@ -52,6 +55,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 @@ -144,9 +156,32 @@ $(CPL) $(TEXTFILES) $@,. $(OS9RENAME) $@,tOC_80d.txt tOC.txt $(CP) $(SUPPORTFILES) $@,. - $(RM) tocgen + $(MOVE) tocgen toctmp tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen +$(DSK_DW3_BECKER): + $(RM) $@ + $(CD) $(LEVEL2)/coco3; make + $(OS9FORMAT_DW3) -q $@ -n$(DSK_DW3_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_80d.txt tOC.txt + $(CP) $(SUPPORTFILES) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen dsk: all $(DSKS) @@ -159,3 +194,4 @@ info: @$(ECHO) "*** King's Quest II ***" @$(foreach dsk, $(DSKS), $(ECHO) $(dsk);) + diff -r 20a6dfbe8982 -r 7aa39bea428b 3rdparty/packages/sierra/kingsquest3/makefile --- a/3rdparty/packages/sierra/kingsquest3/makefile Wed Jan 09 13:34:05 2013 -0600 +++ b/3rdparty/packages/sierra/kingsquest3/makefile Wed Jan 09 16:51:45 2013 -0600 @@ -11,9 +11,10 @@ DISK_2_40D = kingquest3_d2_40d.dsk DISK_3_40D = kingquest3_d3_40d.dsk DISK_80D = kingquest3_80d.dsk -DSK_DW3 = kingsquest3_dw3.dsk +DSK_DW3 = kingsquest3_dw3.dsk +DSK_DW3_BECKER = kingsquest3_dw3_becker.dsk -DSKS = $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DSK_DW3) +DSKS = $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DSK_DW3) $(DSK_DW3_BECKER) DISK_1_40D_NAME = "King's Quest III Disk 1" DISK_2_40D_NAME = "King's Quest III Disk 2" @@ -27,6 +28,7 @@ # We make our own bootfile and kernel track KERNEL = $(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 OS9BOOT_40D = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ @@ -46,7 +48,7 @@ $(MD)/vrn.dr $(MD)/vi.dd \ $(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd -BOOTFILE_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ +BOOTFILE_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \ $(MD)/scf.mn $(MD)/vtio.dr \ @@ -55,6 +57,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 @@ -150,10 +161,34 @@ $(CPL) $(TEXTFILES_DW3) $(DSK_DW3),. $(OS9RENAME) $(DSK_DW3),tOC_dw3.txt tOC.txt $(CP) $(SUPPORTFILES) $(DSK_DW3),. - $(RM) tocgen + $(MOVE) tocgen toctmp tocgen $(DSK_DW3),tOC.txt $(DSK_DW3),tOC + $(MOVE) toctmp tocgen -dsk: dsk_40d dsk_80d dsk_dw3 +dsk_dw3_becker: all + $(RM) $(DSK_DW3_BECKER) + $(CD) $(LEVEL2)/coco3; make + $(OS9FORMAT_DW3) -q $(DSK_DW3_BECKER) -n$(DSK_DW3_NAME) + $(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot_dw3 + $(MERGE) $(KERNEL_DW3_BECKER)>kernel_dw3 + $(OS9GEN) $(DSK_DW3_BECKER) -b=os9boot_dw3 -t=kernel_dw3 + $(RM) os9boot_dw3 kernel_dw3 + $(MAKDIR) $(DSK_DW3_BECKER),CMDS + $(CP) $(CMDS) $(DSK_DW3_BECKER),CMDS + $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW3_BECKER),CMDS/$(file);) + $(MERGE) $(BOOTCMDS)>shell + $(CP) shell $(DSK_DW3_BECKER),CMDS + $(RM) shell + $(OS9ATTR) $(DSK_DW3_BECKER),CMDS/shell -e -pe -pr -e -w -r + $(OS9RENAME) $(DSK_DW3_BECKER),CMDS/sierra AutoEx + $(CPL) $(TEXTFILES_DW3) $(DSK_DW3_BECKER),. + $(OS9RENAME) $(DSK_DW3_BECKER),tOC_dw3.txt tOC.txt + $(CP) $(SUPPORTFILES) $(DSK_DW3_BECKER),. + $(MOVE) tocgen toctmp + tocgen $(DSK_DW3_BECKER),tOC.txt $(DSK_DW3_BECKER),tOC + $(MOVE) toctmp tocgen + +dsk: dsk_40d dsk_80d dsk_dw3 dsk_dw3_becker dskcopy: dsk $(CP) $(DSKS) $(DSKDIR) diff -r 20a6dfbe8982 -r 7aa39bea428b 3rdparty/packages/sierra/kingsquest4/makefile --- a/3rdparty/packages/sierra/kingsquest4/makefile Wed Jan 09 13:34:05 2013 -0600 +++ b/3rdparty/packages/sierra/kingsquest4/makefile Wed Jan 09 16:51:45 2013 -0600 @@ -11,8 +11,9 @@ DISK_2_80D = kingsquest4_d2_80d.dsk DISK_3_80D = kingsquest4_d3_80d.dsk DISK_DW3 = kingsquest4_dw3.dsk +DISK_DW3_BECKER = kingsquest4_dw3_becker.dsk -DSKS = $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) +DSKS = $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) $(DISK_DW3_BECKER) DISK_1_80D_NAME = "King's Quest IV Disk 1" DISK_2_80D_NAME = "King's Quest IV Disk 2" @@ -25,6 +26,8 @@ # We make our own bootfile and kernel track KERNEL = $(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 + OS9BOOT_80D = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rb1773.dr $(MD)/ddd0_80d.dd \ @@ -34,7 +37,7 @@ $(MD)/vrn.dr $(MD)/vi.dd \ $(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd -BOOTFILE_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ +BOOTFILE_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \ $(MD)/scf.mn $(MD)/vtio.dr \ @@ -43,6 +46,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 @@ -69,45 +81,84 @@ clean: dskclean $(RM) $(ALLOBJS) -dsk: all - $(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) +dsk: all $(DSKS) + +$(DISK_1_80D): + $(RM) $@ $(CD) $(LEVEL2)/coco3; make - $(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME) - $(MERGE) $(OS9BOOT_80D)>os9boot_80d - $(MERGE) $(KERNEL)>kernel_1773 - $(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME) - $(MERGE) $(BOOTFILE_DW3)>os9boot_dw3 - $(MERGE) $(KERNEL_DW3)>kernel_dw3 - $(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773 - $(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3 - $(RM) os9boot_80d os9boot_80d kernel_1773 os9boot_dw3 kernel_dw3 - $(MAKDIR) $(DISK_1_80D),CMDS - $(MAKDIR) $(DISK_DW3),CMDS - $(CP) $(CMDS) $(DISK_1_80D),CMDS - $(CP) $(CMDS) $(DISK_DW3),CMDS - $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);) - $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);) + $(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME) + $(MERGE) $(OS9BOOT_80D)>os9boot + $(MERGE) $(KERNEL)>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 $(DISK_1_80D),CMDS - $(CP) shell $(DISK_DW3),CMDS + $(CP) shell $@,CMDS $(RM) shell - $(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r - $(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r - $(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx - $(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx - $(CPL) $(TEXTFILES_D1) $(DISK_1_80D),. - $(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt - $(CPL) $(TEXTFILES_DW3) $(DISK_DW3),. - $(OS9RENAME) $(DISK_DW3),tOC_dw3.txt tOC.txt - $(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),. - $(CP) $(SUPPORTFILES_DW3) $(DISK_DW3),. - $(RM) tocgen - tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC - tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC - $(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME) - $(CP) $(SUPPORTFILES_D2) $(DISK_2_80D),. - $(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME) - $(CP) $(SUPPORTFILES_D3) $(DISK_3_80D),. + $(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r + $(OS9RENAME) $@,CMDS/sierra AutoEx + $(CPL) $(TEXTFILES_D1) $@,. + $(OS9RENAME) $@,tOC_80d.txt tOC.txt + $(CP) $(SUPPORTFILES_D1) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen + +$(DISK_2_80D): + $(RM) $@ + $(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME) + $(CP) $(SUPPORTFILES_D2) $@,. + +$(DISK_3_80D): + $(RM) $@ + $(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME) + $(CP) $(SUPPORTFILES_D3) $@,. + +$(DISK_DW3): + $(RM) $@ + $(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME) + $(MERGE) $(BOOTFILE_DW3)>os9boot + $(MERGE) $(KERNEL_DW3)>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) $@,. + $(OS9RENAME) $@,tOC_dw3.txt tOC.txt + $(CP) $(SUPPORTFILES_DW3) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen + +$(DISK_DW3_BECKER): + $(RM) $@ + $(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME) + $(MERGE) $(BOOTFILE_DW3)>os9boot + $(MERGE) $(KERNEL_DW3)>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) $@,. + $(OS9RENAME) $@,tOC_dw3.txt tOC.txt + $(CP) $(SUPPORTFILES_DW3) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen dskcopy: dsk $(CP) $(DSKS) $(DSKDIR) @@ -118,3 +169,4 @@ info: @$(ECHO) "*** King's Quest IV ***" @$(foreach dsk, $(DSKS), $(ECHO) $(dsk);) + diff -r 20a6dfbe8982 -r 7aa39bea428b 3rdparty/packages/sierra/leisuresuitlarry/makefile --- a/3rdparty/packages/sierra/leisuresuitlarry/makefile Wed Jan 09 13:34:05 2013 -0600 +++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile Wed Jan 09 16:51:45 2013 -0600 @@ -9,9 +9,11 @@ DSK_FLOPPY = leisuresuitlarry.dsk DSK_DW3 = leisuresuitlarry_dw3.dsk +DSK_DW3_BECKER = leisuresuitlarry_dw3_becker.dsk + DSK_NAME = "Leisure Suit Larry" -DSKS = $(DSK_FLOPPY) $(DSK_DW3) +DSKS = $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER) CMDS = sierra mnln scrn shdw tocgen MD = $(LEVEL2)/coco3/modules @@ -19,6 +21,8 @@ # 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_FLOPPY = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rb1773.dr $(MD)/ddd0_40d.dd \ @@ -27,6 +31,7 @@ $(MD)/covdg_small.io $(MD)/term_vdg.dt \ $(MD)/vrn.dr $(MD)/vi.dd \ $(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd + BOOTFILE_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \ @@ -36,6 +41,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 + SUPPORTFILES = logDir object picDir sndDir viewDir vol.0 \ vol.1 vol.2 vol.3 vol.4 words.tok @@ -79,8 +93,27 @@ $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);) $(OS9RENAME) $@,CMDS/sierra AutoEx $(CP) $(SUPPORTFILES) $@,. - $(RM) tocgen + $(MOVE) tocgen toctmp tocgen tOC.txt $@,tOC + $(MOVE) toctmp tocgen + $(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);) + +$(DSK_DW3_BECKER): + $(RM) $@ + $(CD) $(LEVEL2)/coco3; make + $(OS9FORMAT_DW3) -q $@ -n$(DSK_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);) + $(OS9RENAME) $@,CMDS/sierra AutoEx + $(CP) $(SUPPORTFILES) $@,. + $(MOVE) tocgen toctmp + tocgen tOC.txt $@,tOC + $(MOVE) toctmp tocgen $(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);) dskcopy: dsk diff -r 20a6dfbe8982 -r 7aa39bea428b 3rdparty/packages/sierra/manhunter1/makefile --- a/3rdparty/packages/sierra/manhunter1/makefile Wed Jan 09 13:34:05 2013 -0600 +++ b/3rdparty/packages/sierra/manhunter1/makefile Wed Jan 09 16:51:45 2013 -0600 @@ -11,8 +11,9 @@ DISK_2_80D = manhunter1_d2_80d.dsk DISK_3_80D = manhunter1_d3_80d.dsk DISK_DW3 = manhunter1_dw3.dsk +DISK_DW3_BECKER = manhunter1_dw3_becker.dsk -DSKS = $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) +DSKS = $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) $(DISK_DW3_BECKER) DISK_1_80D_NAME = "Manhunter I Disk 1" DISK_2_80D_NAME = "Manhunter I Disk 2" @@ -25,6 +26,7 @@ # We make our own bootfile and kernel track KERNEL = $(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 OS9BOOT_80D = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ @@ -44,6 +46,15 @@ $(MD)/vrn.dr $(MD)/vi.dd \ $(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd +OS9BOOT_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 @@ -69,45 +80,84 @@ clean: dskclean $(RM) $(ALLOBJS) -dsk: all - $(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) +dsk: all $(DSKS) + +$(DISK_1_80D): + $(RM) $@ $(CD) $(LEVEL2)/coco3; make - $(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME) - $(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME) - $(MERGE) $(OS9BOOT_80D)>os9boot_80d - $(MERGE) $(OS9BOOT_DW3)>os9boot_dw3 - $(MERGE) $(KERNEL)>kernel_1773 - $(MERGE) $(KERNEL_DW3)>kernel_dw3 - $(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773 - $(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3 - $(RM) os9boot_80d os9boot_80d kernel_1773 os9boot_dw3 kernel_dw3 - $(MAKDIR) $(DISK_1_80D),CMDS - $(MAKDIR) $(DISK_DW3),CMDS - $(CP) $(CMDS) $(DISK_1_80D),CMDS - $(CP) $(CMDS) $(DISK_DW3),CMDS - $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);) - $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);) + $(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME) + $(MERGE) $(OS9BOOT_80D)>os9boot + $(MERGE) $(KERNEL)>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_D1) $@,. + $(OS9RENAME) $@,tOC_80d.txt tOC.txt + $(CP) $(SUPPORTFILES_D1) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen + +$(DISK_DW3): + $(RM) $@ + $(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME) + $(MERGE) $(KERNEL_DW3)>kernel + $(MERGE) $(OS9BOOT_DW3)>os9boot + $(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 $(DISK_1_80D),CMDS - $(CP) shell $(DISK_DW3),CMDS + $(CP) shell $@,CMDS $(RM) shell - $(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r - $(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r - $(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx - $(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx - $(CPL) $(TEXTFILES_D1) $(DISK_1_80D),. - $(CPL) $(TEXTFILES_DW3) $(DISK_DW3),. - $(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt - $(OS9RENAME) $(DISK_DW3),tOC_dw3.txt tOC.txt - $(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),. - $(CP) $(SUPPORTFILES_DW3) $(DISK_DW3),. - $(RM) tocgen - tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC - tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC - $(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME) - $(CP) $(SUPPORTFILES_D2) $(DISK_2_80D),. + $(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r + $(OS9RENAME) $@,CMDS/sierra AutoEx + $(CPL) $(TEXTFILES_DW3) $@,. + $(OS9RENAME) $@,tOC_dw3.txt tOC.txt + $(CP) $(SUPPORTFILES_DW3) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen + +$(DISK_DW3_BECKER): + $(RM) $@ + $(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME) + $(MERGE) $(KERNEL_DW3)>kernel + $(MERGE) $(OS9BOOT_DW3)>os9boot + $(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) $@,. + $(OS9RENAME) $@,tOC_dw3.txt tOC.txt + $(CP) $(SUPPORTFILES_DW3) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen + +$(DISK_2_80D): + $(RM) $@ + $(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME) + $(CP) $(SUPPORTFILES_D2) $@,. + +$(DISK_3_80D): + $(RM) $@ $(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME) - $(CP) $(SUPPORTFILES_D3) $(DISK_3_80D),. + $(CP) $(SUPPORTFILES_D3) $@,. dskcopy: dsk $(CP) $(DSKS) $(DSKDIR) @@ -118,3 +168,4 @@ info: @$(ECHO) "*** Manhunter I ***" @$(foreach dsk, $(DSKS), $(ECHO) $(dsk);) + diff -r 20a6dfbe8982 -r 7aa39bea428b 3rdparty/packages/sierra/manhunter1/tOC_80d.txt --- a/3rdparty/packages/sierra/manhunter1/tOC_80d.txt Wed Jan 09 13:34:05 2013 -0600 +++ b/3rdparty/packages/sierra/manhunter1/tOC_80d.txt Wed Jan 09 16:51:45 2013 -0600 @@ -2,4 +2,4 @@ d1 s1 v0 v2 v10 d2 s1 v0 v3 d2 s1 v0 v4 v11 v12 -d3 s1 v0 v5 v9 v10 v11 \ No newline at end of file +d3 s1 v0 v5 v9 v10 v11 diff -r 20a6dfbe8982 -r 7aa39bea428b 3rdparty/packages/sierra/manhunter2/makefile --- a/3rdparty/packages/sierra/manhunter2/makefile Wed Jan 09 13:34:05 2013 -0600 +++ b/3rdparty/packages/sierra/manhunter2/makefile Wed Jan 09 16:51:45 2013 -0600 @@ -11,8 +11,9 @@ DISK_2_80D = manhunter2_d2_80d.dsk DISK_3_80D = manhunter2_d3_80d.dsk DISK_DW3 = manhunter2_dw3.dsk +DISK_DW3_BECKER = manhunter2_dw3_becker.dsk -DSKS = $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) +DSKS = $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) $(DISK_DW3_BECKER) DISK_1_80D_NAME = "Manhunter II Disk 1" DISK_2_80D_NAME = "Manhunter II Disk 2" @@ -25,6 +26,7 @@ # We make our own bootfile and kernel track KERNEL = $(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 OS9BOOT_80D = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rb1773.dr $(MD)/ddd0_80d.dd \ @@ -34,7 +36,7 @@ $(MD)/vrn.dr $(MD)/vi.dd \ $(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd -OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ +OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \ $(MD)/rbf.mn \ $(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \ $(MD)/scf.mn $(MD)/vtio.dr \ @@ -43,6 +45,15 @@ $(MD)/vrn.dr $(MD)/vi.dd \ $(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd +OS9BOOT_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 @@ -68,45 +79,85 @@ clean: dskclean $(RM) $(ALLOBJS) -dsk: all - $(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) +dsk: all $(DSKS) + +$(DISK_1_80D): + $(RM) $@ $(CD) $(LEVEL2)/coco3; make - $(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME) - $(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME) - $(MERGE) $(OS9BOOT_80D)>os9boot_80d - $(MERGE) $(OS9BOOT_DW3)>os9boot_dw3 - $(MERGE) $(KERNEL)>kernel_1773 - $(MERGE) $(KERNEL_DW3)>kernel_dw3 - $(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773 - $(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3 - $(RM) os9boot_80d os9boot_80d os9boot_dw3 kernel_1773 kernel_dw3 - $(MAKDIR) $(DISK_1_80D),CMDS - $(MAKDIR) $(DISK_DW3),CMDS - $(CP) $(CMDS) $(DISK_1_80D),CMDS - $(CP) $(CMDS) $(DISK_DW3),CMDS - $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);) - $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);) + $(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME) + $(MERGE) $(OS9BOOT_80D)>os9boot + $(MERGE) $(KERNEL)>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 $(DISK_1_80D),CMDS - $(CP) shell $(DISK_DW3),CMDS + $(CP) shell $@,CMDS $(RM) shell - $(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r - $(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r - $(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx - $(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx - $(CPL) $(TEXTFILES_D1) $(DISK_1_80D),. - $(CPL) $(TEXTFILES_DW3) $(DISK_DW3),. - $(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt - $(OS9RENAME) $(DISK_DW3),tOC_dw3.txt tOC.txt - $(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),. - $(CP) $(SUPPORTFILES_DW3) $(DISK_DW3),. - $(RM) tocgen - tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC - tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC - $(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME) - $(CP) $(SUPPORTFILES_D2) $(DISK_2_80D),. - $(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME) - $(CP) $(SUPPORTFILES_D3) $(DISK_3_80D),. + $(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r + $(OS9RENAME) $@,CMDS/sierra AutoEx + $(CPL) $(TEXTFILES_D1) $@,. + $(OS9RENAME) $@,tOC_80d.txt tOC.txt + $(CP) $(SUPPORTFILES_D1) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen + +$(DISK_2_80D): + $(RM) $@ + $(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME) + $(CP) $(SUPPORTFILES_D2) $@,. + +$(DISK_3_80D): + $(RM) $@ + $(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME) + $(CP) $(SUPPORTFILES_D3) $@,. + +$(DISK_DW3): + $(RM) $@ + $(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME) + $(MERGE) $(OS9BOOT_DW3)>os9boot + $(MERGE) $(KERNEL_DW3)>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) $@,. + $(OS9RENAME) $@,tOC_dw3.txt tOC.txt + $(CP) $(SUPPORTFILES_DW3) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen + +$(DISK_DW3_BECKER): + $(RM) $@ + $(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME) + $(MERGE) $(OS9BOOT_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) $@,. + $(OS9RENAME) $@,tOC_dw3.txt tOC.txt + $(CP) $(SUPPORTFILES_DW3) $@,. + $(MOVE) tocgen toctmp + tocgen $@,tOC.txt $@,tOC + $(MOVE) toctmp tocgen + dskcopy: dsk $(CP) $(DSKS) $(DSKDIR) @@ -117,3 +168,4 @@ info: @$(ECHO) "*** Manhunter II ***" @$(foreach dsk, $(DSKS), $(ECHO) $(dsk);) + diff -r 20a6dfbe8982 -r 7aa39bea428b ChangeLog --- a/ChangeLog Wed Jan 09 13:34:05 2013 -0600 +++ b/ChangeLog Wed Jan 09 16:51:45 2013 -0600 @@ -3,6 +3,25 @@ ---------------------------------------------------------- 2013/01/09 David Ladd M ChangeLog +M 3rdparty/packages/sierra/kingsquest2/makefile +M 3rdparty/packages/sierra/kingsquest3/makefile +M 3rdparty/packages/sierra/kingsquest4/makefile +M 3rdparty/packages/sierra/leisuresuitlarry/makefile +M 3rdparty/packages/sierra/manhunter1/makefile +M 3rdparty/packages/sierra/manhunter1/tOC_80d.txt +M 3rdparty/packages/sierra/manhunter2/makefile + +Fixed tOC_80d.txt file related to manhunter1. The last line did not +have a return in it and was causing a segmentation fault when creating +the disk set. + +Changed makefile(s) for kingsquest2, kingsquest3, kingsquest4, +leisuresuitlarry, manhunter1, and manhunter2 so that becker +boot disks for use with drivewire4 are created. + +---------------------------------------------------------- +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