Mercurial > hg > Members > kono > nitros9-code

changeset 2828:999159b0e7c0 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
retooled port makefiles
author boisy
date Sun, 26 May 2013 15:39:03 -0500
parents dfb70510fa44
children ed9a4cb85fb3
files level1/atari/port.mak level1/coco1/port.mak level1/coco2/port.mak level1/coco2b/port.mak level1/d64/port.mak level1/dalpha/port.mak level1/deluxe/port.mak level1/deluxe/startup level1/modules/init.asm level1/modules/term_vdg.asm level1/modules/vtio.asm level1/tano/port.mak level2/coco3/port.mak level2/coco3/sys/makefile level2/coco3_6309/port.mak level2/coco3_6309/sys/makefile
diffstat 16 files changed, 27 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/level1/atari/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level1/atari/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,7 +2,7 @@
 MACHINE = Atari XL/XE
 CPU = 6809
 LEVEL = 1
-TELNET_PORT = 6800
-HTTPD_PORT = 6801
+TELNET_PORT = 6801
+HTTPD_PORT = 8801
 
 include $(NITROS9DIR)/rules.mak
--- a/level1/coco1/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level1/coco1/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,7 +2,7 @@
 MACHINE = TRS-80 Color Computer
 CPU = 6809
 LEVEL = 1
-TELNET_PORT = 6810
-HTTPD_PORT = 6811
+TELNET_PORT = 6802
+HTTPD_PORT = 8802
 
 include $(NITROS9DIR)/rules.mak
--- a/level1/coco2/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level1/coco2/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,8 +2,8 @@
 MACHINE = Radio Shack Color Computer 2
 CPU = 6809
 LEVEL = 1
-TELNET_PORT = 6820
-HTTPD_PORT = 6821
+TELNET_PORT = 6803
+HTTPD_PORT = 8803
 
 include $(NITROS9DIR)/rules.mak
 
--- a/level1/coco2b/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level1/coco2b/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,8 +2,8 @@
 MACHINE = Tandy Color Computer 2
 CPU = 6809
 LEVEL = 1
-TELNET_PORT = 6830
-HTTPD_PORT = 6831
+TELNET_PORT = 6804
+HTTPD_PORT = 8804
 
 include $(NITROS9DIR)/rules.mak
 
--- a/level1/d64/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level1/d64/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,7 +2,7 @@
 MACHINE = Dragon 64
 CPU = 6809
 LEVEL = 1
-TELNET_PORT = 6860
-HTTPD_PORT = 6861
+TELNET_PORT = 6805
+HTTPD_PORT = 8805
 
 include $(NITROS9DIR)/rules.mak
--- a/level1/dalpha/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level1/dalpha/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,7 +2,7 @@
 MACHINE = Dragon Alpha
 CPU = 6809
 LEVEL = 1
-TELNET_PORT = 6870
-HTTPD_PORT = 6871
+TELNET_PORT = 6806
+HTTPD_PORT = 8806
 
 include $(NITROS9DIR)/rules.mak
--- a/level1/deluxe/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level1/deluxe/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,8 +2,8 @@
 MACHINE = Deluxe Color Computer
 CPU = 6809
 LEVEL = 1
-TELNET_PORT = 6840
-HTTPD_PORT = 6841
+TELNET_PORT = 6807
+HTTPD_PORT = 8807
 
 include $(NITROS9DIR)/rules.mak
 
--- a/level1/deluxe/startup	Thu May 23 18:17:06 2013 -0500
+++ b/level1/deluxe/startup	Sun May 26 15:39:03 2013 -0500
@@ -1,6 +1,6 @@
 * Echo welcome message
-echo * Welcome to NitrOS-9 Level 1  *
-echo * on the Deluxe Color Computer *
+echo * Welcome to NitrOS-9 Level 1
+echo * on the Deluxe Color Computer
 * Start system time from keyboard
 setime </term
 date -t
--- a/level1/modules/init.asm	Thu May 23 18:17:06 2013 -0500
+++ b/level1/modules/init.asm	Sun May 26 15:39:03 2013 -0500
@@ -114,7 +114,7 @@
          fcc    "Radio Shack Color Computer"
          ELSE
          IFNE   deluxe
-         fcc    "Radio Shack Deluxe Color Computer"
+         fcc    "Deluxe Color Computer"
          ELSE
          IFNE   coco2
          fcc    "Radio Shack Color Computer 2"
--- a/level1/modules/term_vdg.asm	Thu May 23 18:17:06 2013 -0500
+++ b/level1/modules/term_vdg.asm	Sun May 26 15:39:03 2013 -0500
@@ -61,7 +61,7 @@
          IFGT  Level-1
          fcb   $01        init value for dev ctl reg
          ELSE
-         IFEQ  coco2b-1
+         IFEQ  coco2b+deluxe-1
          fcb   ModCoVDG+1 init value for dev ctl reg
          ELSE
          fcb   ModCoVDG   init value for dev ctl reg
--- a/level1/modules/vtio.asm	Thu May 23 18:17:06 2013 -0500
+++ b/level1/modules/vtio.asm	Sun May 26 15:39:03 2013 -0500
@@ -93,7 +93,7 @@
                          
          coma             A = $FF
          comb             B = $FF
-         IFEQ  coco2b-1
+         IFEQ  coco2b+deluxe-1
          clr   <V.Caps,u 
          ELSE
          stb   <V.Caps,u 
--- a/level1/tano/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level1/tano/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,7 +2,7 @@
 MACHINE = Tano Dragon
 CPU = 6809
 LEVEL = 1
-TELNET_PORT = 6880
-HTTPD_PORT = 6881
+TELNET_PORT = 6808
+HTTPD_PORT = 8808
 
 include $(NITROS9DIR)/rules.mak
--- a/level2/coco3/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level2/coco3/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,8 +2,8 @@
 MACHINE = Tandy Color Computer 3
 CPU = 6809
 LEVEL = 2
-TELNET_PORT = 6850
-HTTPD_PORT = 6851
+TELNET_PORT = 6809
+HTTPD_PORT = 8809
 
 include $(NITROS9DIR)/rules.mak
 
--- a/level2/coco3/sys/makefile	Thu May 23 18:17:06 2013 -0500
+++ b/level2/coco3/sys/makefile	Sun May 26 15:39:03 2013 -0500
@@ -1,6 +1,4 @@
-PORT = coco3
-include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6806
+include ../port.mak
 
 vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
 vpath %.asm $(LEVEL2)/sys
@@ -50,7 +48,7 @@
 	-$(SOFTLINK) $(LEVEL1)/sys/$@
 
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
-	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@
 
 clean:
 	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES) inetd.conf
--- a/level2/coco3_6309/port.mak	Thu May 23 18:17:06 2013 -0500
+++ b/level2/coco3_6309/port.mak	Sun May 26 15:39:03 2013 -0500
@@ -2,8 +2,8 @@
 MACHINE = Tandy Color Computer 3
 CPU = 6309
 LEVEL = 2
-TELNET_PORT = 6860
-HTTPD_PORT = 6861
+TELNET_PORT = 6810
+HTTPD_PORT = 8810
 
 include $(NITROS9DIR)/rules.mak
 
--- a/level2/coco3_6309/sys/makefile	Thu May 23 18:17:06 2013 -0500
+++ b/level2/coco3_6309/sys/makefile	Sun May 26 15:39:03 2013 -0500
@@ -1,2 +1,1 @@
-TELNET_PORT	= 6807
 include ../../coco3/sys/makefile