Mercurial > hg > Members > kono > nitros9-code

changeset 2763:c03464c24b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker. Updated makefile with new option nightlytest. Run option is "make nightlytest". You also need to test environment variable TESTSSHDIR and TESTSSHSERVER before using it. Also updated the nightly option so if the SOURCEUSER environment variable is not set it will report it.
author drencor-xeen
date Wed, 16 Jan 2013 17:33:46 -0600
parents 9b29d654db13
children 2af3df45f157
files 3rdparty/packages/arcadepak/makefile ChangeLog makefile
diffstat 3 files changed, 164 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/arcadepak/makefile	Wed Jan 16 13:16:05 2013 -0600
+++ b/3rdparty/packages/arcadepak/makefile	Wed Jan 16 17:33:46 2013 -0600
@@ -9,6 +9,8 @@
 CMD		= $(6809L2)/cmds
 DISK_40D	= arcadepack_40d.dsk
 DISK_80D	= arcadepack_80d.dsk
+DISK_DW3	= arcadepack_dw3.dsk
+DISK_BECKER	= arcadepack_becker.dsk
 CMDS		= grfdrv runb
 SHELLMODS	= $(CMD)/shell_21 $(CMD)/dir $(CMD)/echo $(CMD)/link $(CMD)/load $(CMD)/mdir
 		
@@ -25,6 +27,9 @@
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_40 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW3	= $(MD)/rel_40 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_BECKER	= $(MD)/rel_40 $(MD)/boot_dw3_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -45,14 +50,36 @@
 		$(MD)/w6.dw $(MD)/w7.dw \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
+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 \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/cogrf.io $(MD)/term_win40.dt $(MD)/w.dw $(MD)/w1.dw \
+		$(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw $(MD)/w5.dw \
+		$(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
+OS9BOOT_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)/cogrf.io $(MD)/term_win40.dt $(MD)/w.dw $(MD)/w1.dw \
+		$(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw $(MD)/w5.dw \
+		$(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
 ALLOBJS		= $(CMDS)
 
+DSKS		= $(DISK_40D) $(DISK_80D) $(DISK_DW3) $(DISK_BECKER)
+
 all: shell
 	$(CD) smash; make
 	$(CD) thexder; make
 	$(CD) shanghai; make
 
-dsk:	$(DISK_40D) $(DISK_80D)
+dsk:	all $(DSKS)
 
 shell:	$(DEPENDS)
 	$(MERGE) $(SHELLMODS)>$@
@@ -118,6 +145,64 @@
 	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
 	$(CPL) startup $@,
 
+$(DISK_DW3): all
+	$(RM) $@
+	$(CD) $(6809L2); make
+	$(OS9FORMAT_DW3) $@ -n"NitrOS-9 Arcade Pack"
+	$(MERGE) $(OS9BOOT_DW3)>os9boot
+	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) shell $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MAKDIR) $@,SYS
+	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(CPL) startup $@,
+
+$(DISK_BECKER): all
+	$(RM) $@
+	$(CD) $(6809L2); make
+	$(OS9FORMAT_DW3) $@ -n"NitrOS-9 Arcade Pack"
+	$(MERGE) $(OS9BOOT_BECKER)>os9boot
+	$(MERGE) $(KERNEL_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) shell $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MAKDIR) $@,SYS
+	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(CPL) startup $@,
+
 clean:	dskclean
 	$(RM) shell
 	$(CD) smash; make clean
@@ -125,10 +210,10 @@
 	$(CD) shanghai; make clean
 
 dskcopy: dsk
-	$(CP) $(DISK_40D) $(DISK_80D) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK_40D) $(DISK_80D)
+	$(RM) $(DSKS) 
 
 info:
 	@$(ECHO) "*** NitrOS-9 Arcade Pak ***"
--- a/ChangeLog	Wed Jan 16 13:16:05 2013 -0600
+++ b/ChangeLog	Wed Jan 16 17:33:46 2013 -0600
@@ -2,6 +2,28 @@
 
 ----------------------------------------------------------
 2013/01/16 David Ladd
+M ChangeLog
+M 3rdparty/packages/arcadepak/makefile
+M makefile
+
+Updated makefile for the arcadepak to now create DW3 &
+BECKER boot disks.
+
+Added new make option to the main makefile.  New option
+is "make nightlytest"  This option uses environment
+variables called TESTSSHSERVER and TESTSSHDIR. This will
+allow testing of the nightly upload to a host ssh server
+of your choice as well as folder(s) on that account of
+your choice.  This was added strictly for testing use.
+
+Also added a check to the makefile at the nightly section
+if the user does not have the environment variable
+SOURCEUSER set then it will echo a responce saying that
+the user needs to set this environment variable before
+using this option.
+
+----------------------------------------------------------
+2013/01/16 David Ladd
 M 3rdparty/packages/arcadepak/makefile
 M 3rdparty/packages/arcadepak/smash/makefile
 M 3rdparty/packages/arcadepak/thexder/makefile
--- a/makefile	Wed Jan 16 13:16:05 2013 -0600
+++ b/makefile	Wed Jan 16 17:33:46 2013 -0600
@@ -1,5 +1,6 @@
 ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
+NITROS9DIR      := $(HOME)/nitros9
+export NITROS9DIR
 endif
 include $(NITROS9DIR)/rules.mak
 
@@ -55,10 +56,61 @@
 
 info:
 	@$(foreach dir, $(dirs), ($(CD) $(dir); make info);)
-	
+
+# This section is to do the nightly build and upload 
+# to sourceforge.net you must set the environment
+# variable SOURCEUSER to the userid you have for sourceforge.net
+# The "burst" script is found in the scripts folder and must
+# on your ssh account at sourceforge.net
+ifdef	SOURCEUSER
 nightly: clean hgupdate dskcopy
 	make info>$(DSKDIR)/ReadMe
 	$(ARCHIVE) nitros9project $(DSKDIR)/*
 	scp nitros9project.zip $(SOURCEUSER),nitros9@web.sourceforge.net:/home/groups/n/ni/nitros9/htdocs
 	ssh $(SOURCEUSER),nitros9@shell.sourceforge.net create
 	ssh $(SOURCEUSER),nitros9@shell.sourceforge.net "./burst"
+else
+nightly:
+	@echo ""
+	@echo ""
+	@echo "You need to set the SOURCEUSER variable"
+	@echo "You may wish to refer to the nightly"
+	@echo "section of the makefile."
+endif
+
+# This section is to run a nightly test.
+# This requires you to setup a environment variable
+# called TESTSSHSERVER.
+# example would be: TESTSSHSERVER='testuser@localhost'
+# another example: TESTSSHSERVER='testuser@test.testhost.com'
+#
+# You are also required to setup a target path for your file
+# and the environment variable that is being used in this
+# section is called TESTSSHDIR
+ifdef	TESTSSHSERVER
+ifdef	TESTSSHDIR
+nightlytest: clean hgupdate dskcopy
+	make info>$(DSKDIR)/ReadMe
+	$(ARCHIVE) nitros9project $(DSKDIR)/*
+	scp nitros9project.zip $(TESTSSHSERVER):$(TESTSSHDIR)
+	ssh $(TESTSSHSERVER) "./burst"
+else
+nightlytest:
+	@echo ""
+	@echo ""
+	@echo "You need to set the TESTSSHDIR variable"
+	@echo "You may wish to refer to the nightlytest"
+	@echo "section of the makefile to see what"
+	@echo "needs to be setup first before using"
+	@echo "this option"
+endif
+else
+nightlytest:
+	@echo ""
+	@echo ""
+	@echo "You need to set the TESTSSHSERVER variable"
+	@echo "You may wish to refer to the nightlytest"
+	@echo "section of the makefile to see what"
+	@echo "needs to be setup first before using"
+	@echo "this option."
+endif