Mercurial > hg > Members > kono > nitros9-code

changeset 2826:e76cc015cc03 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
incorporated new port.mak file in every port directory
author Boisy Pitre <boisy.pitre@nuance.com>
date Thu, 23 May 2013 18:09:08 -0500
parents 99fac4bd9c41
children dfb70510fa44
files level1/atari/bootfiles/makefile level1/atari/cmds/makefile level1/atari/defs/makefile level1/atari/makefile level1/atari/modules/makefile level1/atari/port.mak level1/atari/sys/makefile level1/atari/wwwroot/Makefile level1/coco1/bootfiles/makefile level1/coco1/bootroms/makefile level1/coco1/cmds/makefile level1/coco1/defs/makefile level1/coco1/makefile level1/coco1/modules/makefile level1/coco1/port.mak level1/coco1/sys/makefile level1/coco1/wwwroot/Makefile level1/coco2/bootfiles/makefile level1/coco2/bootroms/makefile level1/coco2/cmds/makefile level1/coco2/defs/makefile level1/coco2/makefile level1/coco2/modules/makefile level1/coco2/port.mak level1/coco2/sys/makefile level1/coco2/wwwroot/Makefile level1/coco2b/port.mak level1/coco2b/wwwroot/Makefile level1/deluxe/Makefile level1/deluxe/port.mak level1/deluxe/wwwroot/Makefile level1/wwwroot/Makefile level1/wwwroot/index.html level2/coco3/makefile level2/coco3/port.mak level2/coco3/wwwroot/Makefile level2/coco3_6309/port.mak level2/coco3_6309/wwwroot/Makefile
diffstat 38 files changed, 116 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/level1/atari/bootfiles/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/atari/bootfiles/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,5 +1,4 @@
-PORT = atari
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 # Module directory
 MD		= ../modules
--- a/level1/atari/cmds/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/atari/cmds/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,5 +1,4 @@
-PORT = atari
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 vpath %.as $(LEVEL1)/cmds
 vpath %.asm $(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
--- a/level1/atari/defs/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/atari/defs/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,5 +1,4 @@
-PORT = atari
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 DEPENDS		= ./makefile
 
--- a/level1/atari/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/atari/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,8 +1,4 @@
-PORT = atari
-include $(NITROS9DIR)/rules.mak
-
-CPU		= 6809
-LEVEL		= 1
+include port.mak
 
 # Level 1 - Specify which shell should be used
 #WHICHSHELL	= shellplus
@@ -12,12 +8,13 @@
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
 BOOTFILE	= bootfiles/bootfile
-DIRS		= cmds modules defs sys bootfiles
+DIRS		= cmds modules defs sys bootfiles wwwroot
 
 
 CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs_dw)
 CMDS_DEMO = $(shell $(CD) cmds; make --no-print-directory showobjs_demo)
 SYS		= $(shell $(CD) sys; make --no-print-directory showobjs)
+WWWROOT		= $(shell $(CD) wwwroot; make --no-print-directory showobjs)
 DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
 STARTUP		= startup
 
@@ -30,9 +27,9 @@
 # Make all components
 all:
 	@$(ECHO) "**************************************************"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "*        NitrOS-9/$(CPU) Level 1 Atari Port        *"
-	@$(ECHO) "*                                                *"
+	@$(ECHO) "*"
+	@$(ECHO) "*        NitrOS-9/$(CPU) Level $(LEVEL) $(PORTNAME)"
+	@$(ECHO) "*"
 	@$(ECHO) "**************************************************"
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
 
@@ -62,12 +59,13 @@
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
 	$(MAKDIR) $@,WWWROOT
-	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) wwwroot; $(CP) $(WWWROOT) ../$@,WWWROOT
+	$(foreach file, $(WWWROOT), $(OS9ATTR_TEXT) $@,WWWROOT/$(file);)
 	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(STARTUP) $@,startup
--- a/level1/atari/modules/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/atari/modules/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,5 +1,4 @@
-PORT = atari
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 vpath %.asm $(LEVEL1)/modules
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/atari/port.mak	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,8 @@
+PORT = atari
+MACHINE = Atari XL/XE
+CPU = 6809
+LEVEL = 1
+TELNET_PORT = 6800
+HTTPD_PORT = 6801
+
+include $(NITROS9DIR)/rules.mak
--- a/level1/atari/sys/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/atari/sys/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,7 +1,4 @@
-PORT = atari
-include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6800
-HTTPD_PORT	= 6801
+include ../port.mak
 
 vpath %.hp	$(LEVEL1)/sys
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/atari/wwwroot/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,1 @@
+include ../../wwwroot/Makefile
--- a/level1/coco1/bootfiles/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco1/bootfiles/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,7 +1,4 @@
-ifeq ($(PORT),)
-        PORT=coco1
-endif
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 # Module directory
 MD		= ../modules
--- a/level1/coco1/bootroms/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco1/bootroms/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,7 +1,4 @@
-ifeq ($(PORT),)
-        PORT=coco1
-endif
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 # Module directory
 MD		= ../modules
--- a/level1/coco1/cmds/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco1/cmds/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,7 +1,4 @@
-ifeq ($(PORT),)
-        PORT=coco1
-endif
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 vpath %.as $(LEVEL1)/cmds
 vpath %.asm $(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
--- a/level1/coco1/defs/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco1/defs/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,7 +1,4 @@
-ifeq ($(PORT),)
-        PORT=coco1
-endif
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 DEPENDS		= ./makefile
 
--- a/level1/coco1/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco1/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,10 +1,4 @@
-ifeq ($(PORT),)
-	PORT=coco1
-endif
-include $(NITROS9DIR)/rules.mak
-
-CPU		= 6809
-LEVEL		= 1
+include port.mak
 
 # Level 1 - Specify which shell should be used
 #WHICHSHELL	= shellplus
@@ -30,7 +24,7 @@
 KERNELFILE_DW	= bootfiles/kernel_dw
 KERNELFILE_BECKER	= bootfiles/kernel_becker
 KERNELFILE_ARDUINO	= bootfiles/kernel_arduino
-DIRS		= cmds modules defs sys bootfiles bootroms
+DIRS		= cmds modules defs sys bootfiles bootroms wwwroot
 
 
 CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
@@ -46,6 +40,7 @@
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
 SYS		= $(shell $(CD) sys; make --no-print-directory showobjs)
+WWWROOT		= $(shell $(CD) wwwroot; make --no-print-directory showobjs)
 DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
 STARTUP		= startup
 STARTUP_DW	= startup.dw
@@ -110,7 +105,6 @@
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
 	$(MAKDIR) $@,WWWROOT
-	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -118,6 +112,8 @@
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) wwwroot; $(CP) $(WWWROOT) ../$@,WWWROOT
+	$(foreach file, $(WWWROOT), $(OS9ATTR_TEXT) $@,WWWROOT/$(file);)
 	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(STARTUP_DW) $@,startup
--- a/level1/coco1/modules/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco1/modules/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,7 +1,4 @@
-ifeq ($(PORT),)
-        PORT=coco1
-endif
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 vpath %.asm $(LEVEL1)/modules
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/coco1/port.mak	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,8 @@
+PORT = coco1
+MACHINE = TRS-80 Color Computer
+CPU = 6809
+LEVEL = 1
+TELNET_PORT = 6810
+HTTPD_PORT = 6811
+
+include $(NITROS9DIR)/rules.mak
--- a/level1/coco1/sys/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco1/sys/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,9 +1,4 @@
-ifeq ($(PORT),)
-        PORT=coco1
-endif
-include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6810
-HTTPD_PORT	= 6811
+include ../port.mak
 
 vpath %.hp	$(LEVEL1)/sys
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/coco1/wwwroot/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,1 @@
+include ../../wwwroot/Makefile
--- a/level1/coco2/bootfiles/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco2/bootfiles/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,2 +1,1 @@
-PORT=coco2
 include ../../coco1/bootfiles/makefile
--- a/level1/coco2/bootroms/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco2/bootroms/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,2 +1,1 @@
-PORT=coco2
 include ../../coco1/bootroms/makefile
--- a/level1/coco2/cmds/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco2/cmds/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,2 +1,1 @@
 include ../../coco1/cmds/makefile
-PORT=coco2
--- a/level1/coco2/defs/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco2/defs/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,2 +1,1 @@
-PORT=coco2
 include ../../coco1/defs/makefile
--- a/level1/coco2/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco2/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,2 +1,1 @@
-PORT=coco2
 include ../coco1/makefile
--- a/level1/coco2/modules/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco2/modules/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,2 +1,1 @@
-PORT=coco2
 include ../../coco1/modules/makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/coco2/port.mak	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,9 @@
+PORT = coco2
+MACHINE = Radio Shack Color Computer 2
+CPU = 6809
+LEVEL = 1
+TELNET_PORT = 6820
+HTTPD_PORT = 6821
+
+include $(NITROS9DIR)/rules.mak
+
--- a/level1/coco2/sys/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/coco2/sys/makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,9 +1,4 @@
-ifeq ($(PORT),)
-        PORT=coco1
-endif
-include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6820
-HTTPD_PORT	= 6821
+include ../port.mak
 
 vpath %.hp	$(LEVEL1)/sys
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/coco2/wwwroot/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,1 @@
+include ../../wwwroot/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/coco2b/port.mak	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,9 @@
+PORT = coco2b
+MACHINE = Tandy Color Computer 2
+CPU = 6809
+LEVEL = 1
+TELNET_PORT = 6830
+HTTPD_PORT = 6831
+
+include $(NITROS9DIR)/rules.mak
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/coco2b/wwwroot/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,1 @@
+include ../../wwwroot/Makefile
--- a/level1/deluxe/Makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level1/deluxe/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -1,2 +1,1 @@
-PORT=deluxe
 include ../coco1/makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/deluxe/port.mak	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,9 @@
+PORT = deluxe
+MACHINE = Deluxe Color Computer
+CPU = 6809
+LEVEL = 1
+TELNET_PORT = 6840
+HTTPD_PORT = 6841
+
+include $(NITROS9DIR)/rules.mak
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/deluxe/wwwroot/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,1 @@
+include ../../wwwroot/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/wwwroot/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,14 @@
+include ../port.mak
+
+DEPENDS		= ./Makefile
+
+index.html:	$(LEVEL1)/wwwroot/index.html
+	@sed -e 's|%PORT%|$(PORT)|' -e 's|%MACHINE%|$(MACHINE)|' $^ > $@
+
+all:	index.html $(DEPENDS)
+
+clean:
+	$(RM) index.html
+
+showobjs:
+	@$(ECHO) index.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/wwwroot/index.html	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,8 @@
+<HTML>
+<BODY>
+<CENTER>
+Welcome to...
+<H1>NitrOS-9 on the %MACHINE%</H1>
+</CENTER>
+</BODY>
+</HTML>
--- a/level2/coco3/makefile	Thu May 23 10:08:57 2013 -0500
+++ b/level2/coco3/makefile	Thu May 23 18:09:08 2013 -0500
@@ -25,7 +25,7 @@
 KERNELFILE	= bootfiles/kernel_1773
 KERNELFILE_50HZ	= bootfiles/kernel_1773_50hz
 KERNELFILE_DW 	= bootfiles/kernel_dw
-DIRS		= cmds modules defs sys bootfiles
+DIRS		= cmds modules defs sys bootfiles wwwroot
 
 CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level2/coco3/port.mak	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,9 @@
+PORT = coco3
+MACHINE = Tandy Color Computer 3
+CPU = 6809
+LEVEL = 2
+TELNET_PORT = 6850
+HTTPD_PORT = 6851
+
+include $(NITROS9DIR)/rules.mak
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level2/coco3/wwwroot/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,1 @@
+include ../../../level1/wwwroot/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level2/coco3_6309/port.mak	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,9 @@
+PORT = coco3
+MACHINE = Tandy Color Computer 3
+CPU = 6309
+LEVEL = 2
+TELNET_PORT = 6860
+HTTPD_PORT = 6861
+
+include $(NITROS9DIR)/rules.mak
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level2/coco3_6309/wwwroot/Makefile	Thu May 23 18:09:08 2013 -0500
@@ -0,0 +1,1 @@
+include ../../../level1/wwwroot/Makefile