Mercurial > hg > Members > kono > nitros9-code

changeset 1427:b3868abe1fee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rearrangement of directories and files for making bootable 6809/6309 MV disks
author boisy
date Tue, 02 Dec 2003 22:35:55 +0000
parents 58b7b86f61d5
children 7e0ecb2e394a
files 3rdparty/packages/multivue/cmds_6309/makefile 3rdparty/packages/multivue/cmds_6809/defsfile 3rdparty/packages/multivue/cmds_6809/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/multivue/sys/makefile
diffstat 5 files changed, 100 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/multivue/cmds_6309/makefile	Tue Dec 02 20:37:44 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6309/makefile	Tue Dec 02 22:35:55 2003 +0000
@@ -1,20 +1,19 @@
 include ../../../../rules.mak
 
-H6309		= $(AFLAGS) -aH6309=1 -e
+vpath %.asm $(6809L2)/cmds:../cmds_6809
+
+AFLAGS		+= -e
 DEPENDS		= ./makefile
 
-CMDS		= gshell_6309 gshell_6809 \
-		cocopr control demo fstat gcal gcalc gclock gport gprint
+CMDS		= grfdrv \
+		gshell cocopr control demo fstat gcal gcalc gclock gport \
+		gprint
 
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
-	$(CD) icons; make
 
-gshell_6309: gshell.asm
-	$(AS) $(ASOUT)$@ $< $(H6309)
-
-gshell_6809: gshell.asm
+gshell: gshell.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS)
 
 clean:
--- a/3rdparty/packages/multivue/cmds_6809/defsfile	Tue Dec 02 20:37:44 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6809/defsfile	Tue Dec 02 22:35:55 2003 +0000
@@ -1,4 +1,5 @@
 Level    equ   2
          use   os9defs   
          use   scfdefs   
+         use   systype   
          use   rbfdefs   
--- a/3rdparty/packages/multivue/cmds_6809/makefile	Tue Dec 02 20:37:44 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6809/makefile	Tue Dec 02 22:35:55 2003 +0000
@@ -1,20 +1,18 @@
 include ../../../../rules.mak
 
-H6309		= $(AFLAGS) -aH6309=1 -e
+vpath %.asm $(6809L2)/cmds
+
 DEPENDS		= ./makefile
 
-CMDS		= gshell_6309 gshell_6809 \
-		cocopr control demo fstat gcal gcalc gclock gport gprint
+CMDS		= grfdrv \
+		gshell cocopr control demo fstat gcal gcalc gclock gport \
+		gprint
 
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
-	$(CD) icons; make
 
-gshell_6309: gshell.asm
-	$(AS) $(ASOUT)$@ $< $(H6309)
-
-gshell_6809: gshell.asm
+gshell: gshell.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS)
 
 clean:
--- a/3rdparty/packages/multivue/makefile	Tue Dec 02 20:37:44 2003 +0000
+++ b/3rdparty/packages/multivue/makefile	Tue Dec 02 22:35:55 2003 +0000
@@ -1,11 +1,38 @@
 include ../../../rules.mak
 
-DISK	= multivue.dsk
-CMDS	= $(shell $(CD) cmds; make showobjs)
-ICONS	= $(shell $(CD) cmds/icons; make showobjs)
+DISK68	= multivue_6809.dsk
+DISK63	= multivue_6309.dsk
+CMDS68	= $(shell $(CD) cmds_6809; make showobjs)
+CMDS63	= $(shell $(CD) cmds_6309; make showobjs)
+ICONS	= icon.demo
 SYSBIN	= $(shell $(CD) sys; make showbinobjs)
 SYSTEXT	= $(shell $(CD) sys; make showtextobjs)
-DEMO	= $(shell $(CD) demo; make showobjs)
+DEMO	= aif.dmo
+
+MD68	= $(6809L2)/modules
+MD63	= $(6309L2)/modules
+
+KERNEL68	= $(MD68)/rel_32 $(MD68)/boot_1773_6ms $(MD68)/kernel
+KERNEL63	= $(MD63)/rel_32 $(MD63)/boot_1773_6ms $(MD63)/kernel
+
+OS9BOOT68	= $(MD68)/rel_32 $(MD68)/ioman $(MD68)/init \
+		$(MD68)/rbf.mn \
+		$(MD68)/cc3disk.dr $(MD63)/ddd0_40d.dd \
+		$(MD68)/scf.mn $(MD68)/cc3io.dr \
+		$(MD68)/keydrv_cc3.sb $(MD68)/joydrv_joy.sb $(MD68)/snddrv_cc3.sb \
+		$(MD68)/windint.io $(MD68)/term_win40.dt \
+		$(MD68)/clock_60hz $(MD68)/clock2_soft \
+		$(MD68)/sysgo_dd
+
+OS9BOOT63	= $(MD63)/rel_32 $(MD63)/ioman $(MD63)/init \
+		$(MD63)/rbf.mn \
+		$(MD63)/cc3disk.dr $(MD63)/ddd0_40d.dd \
+		$(MD63)/scf.mn $(MD63)/cc3io.dr \
+		$(MD63)/keydrv_cc3.sb $(MD63)/joydrv_joy.sb $(MD63)/snddrv_cc3.sb \
+		$(MD63)/windint.io $(MD63)/term_win40.dt \
+		$(MD63)/clock_60hz $(MD63)/clock2_soft \
+		$(MD63)/sysgo_dd
+
 
 # Make all components
 all:
@@ -14,37 +41,64 @@
 	@$(ECHO) "*                    Multi-Vue                   *"
 	@$(ECHO) "*                                                *"
 	@$(ECHO) "**************************************************"
-	$(CD) cmds; make
+	$(CD) cmds_6809; make
+	$(CD) cmds_6309; make
 	$(CD) sys; make
-	$(CD) demo; make
 
 # Clean all components
 clean:	dskclean
-	-$(CD) cmds; make clean
+	-$(CD) cmds_6809; make clean
+	-$(CD) cmds_6309; make clean
 	-$(CD) sys; make clean
-	-$(CD) demo; make clean
 
 dsk:	all
-	$(RM) $(DISK)
-	$(OS9FORMAT_DS40) $(DISK) -q -n"Multi-Vue"
-	$(MAKDIR) $(DISK),CMDS
-	$(MAKDIR) $(DISK),CMDS/ICONS
-	$(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);)
+	$(RM) $(DISK68)
+	$(OS9FORMAT_DS40) $(DISK68) -q -n"Multi-Vue"
+	$(MERGE) $(OS9BOOT68)>os9boot
+	$(MERGE) $(KERNEL68)>kernel
+	$(OS9GEN) $(DISK68) -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $(DISK68),CMDS
+	$(MAKDIR) $(DISK68),CMDS/ICONS
+	$(MAKDIR) $(DISK68),SYS
+	$(MAKDIR) $(DISK68),DEMO
+	$(CD) cmds_6809; $(CP) $(CMDS68) ../$(DISK68),CMDS
+	$(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $(DISK68),CMDS/$(file);)
+	$(OS9RENAME) $(DISK68),CMDS/gshell AutoEx
+	$(CD) icons; $(CP) $(ICONS) ../$(DISK68),CMDS/ICONS
+	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $(DISK68),CMDS/ICONS/$(file);)
+	$(CD) sys; $(CP) $(SYSBIN) ../$(DISK68),SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $(DISK68),SYS/$(file);)
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$(DISK68),SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $(DISK68),SYS/$(file);)
+	$(CD) demo; $(CPL) $(DEMO) ../$(DISK68),DEMO
+	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $(DISK68),DEMO/$(file);)
+	$(RM) $(DISK63)
+	$(OS9FORMAT_DS40) $(DISK63) -q -n"Multi-Vue"
+	$(MERGE) $(OS9BOOT63)>os9boot
+	$(MERGE) $(KERNEL63)>kernel
+	$(OS9GEN) $(DISK63) -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $(DISK63),CMDS
+	$(MAKDIR) $(DISK63),CMDS/ICONS
+	$(MAKDIR) $(DISK63),SYS
+	$(MAKDIR) $(DISK63),DEMO
+	$(CD) cmds_6309; $(CP) $(CMDS63) ../$(DISK63),CMDS
+	$(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $(DISK63),CMDS/$(file);)
+	$(OS9RENAME) $(DISK63),CMDS/gshell AutoEx
+	$(CD) icons; $(CP) $(ICONS) ../$(DISK63),CMDS/ICONS
+	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $(DISK63),CMDS/ICONS/$(file);)
+	$(CD) sys; $(CP) $(SYSBIN) ../$(DISK63),SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $(DISK63),SYS/$(file);)
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$(DISK63),SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $(DISK63),SYS/$(file);)
+	$(CD) demo; $(CPL) $(DEMO) ../$(DISK63),DEMO
+	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $(DISK63),DEMO/$(file);)
 
 dskcopy: dsk
-	$(CP) $(DISK) $(DSKDIR)
+	$(CP) $(DISK68) $(DSKDIR)
+	$(CP) $(DISK63) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK)
+	$(RM) $(DISK68) $(DISK63)
 
--- a/3rdparty/packages/multivue/sys/makefile	Tue Dec 02 20:37:44 2003 +0000
+++ b/3rdparty/packages/multivue/sys/makefile	Tue Dec 02 22:35:55 2003 +0000
@@ -1,18 +1,19 @@
 include ../../../../rules.mak
 
+vpath %.asm	$(6809L2)/sys
+
 DEPENDS		= ./makefile
 
 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 \
-		ibm_edc.fnt iso_latin1.fnt
+		ibmedcfont isolatin1font
 
 HELPMSG		= helpmsg
 
-BINFILES	= $(ASSETFILES)
 TEXTFILES	= $(SYSFILES) $(HELPMSG)
-ALLOBJS		= $(BINFILES) $(TEXTFILES)
+ALLOBJS		= $(ASSETFILES) $(TEXTFILES)
 
 all:	$(ALLOBJS) $(DEPENDS)
 
@@ -20,10 +21,10 @@
 	$(MERGE) $(HELPFILES) > $@
 
 clean:
-	$(RM) $(HELPMSG)
+	$(RM) $(HELPMSG) $(ASSETFILES)
 
 showbinobjs:
-	@$(ECHO) $(BINFILES)
+	@$(ECHO) $(ASSETFILES)
 
 showtextobjs:
 	@$(ECHO) $(TEXTFILES)