changeset 41:0d570c55ebd4 nitros9-version

fix for hg cloned nistros 9 code
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Tue, 17 Jul 2018 11:42:58 +0900
parents b8fa36c04ff7
children 5978348b68f9
files os9/Makefile os9/level1/Makefile os9/level2/Makefile os9/level2/defsfile
diffstat 4 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/os9/Makefile	Tue Jul 17 10:55:16 2018 +0900
+++ b/os9/Makefile	Tue Jul 17 11:42:58 2018 +0900
@@ -12,19 +12,19 @@
 clean :
 	rm -rf makerom *.rom os9mod *.dSYM
 
-os9d.rom : makerom level1/init
+os9d.rom : makerom level1/init 
 	./makerom -o os9d.rom  level1/shell level1/sysgo level1/ioman level1/term level1/pty level1/pdisk level1/d0 level1/d1 level1/clock level1/scf level1/rbf level1/init level1/os9p2 level1/os9p1
    
 os9lv2.rom : makerom level2/init
 	./makerom -o os9lv2.rom -2  level2/Shell  level2/dir level2/d1 level2/ioman  level2/os9p3_perr level2/os9p4_regdump  level2/pipe level2/piper level2/pipeman  level2/scf level2/rbf level2/os9p2 level2/sysgo level2/pdisk level2/d0 level2/pty level2/term level2/init level2/boot level2/os9p1 
 
 
-level1/init :
+level1/init : nitros9-code
 	cd level1 ; make
 
-level2/init :
+level2/init : nitros9-code
 	cd level2 ; make
 
-# os9m.rom : makerom level1/term
-# 	./makerom -o os9m.rom  modules/Shell level1/sysgo modules/IOMan level1/term level1/pty level1/pdisk level1/d0 level1/d1  level1/SCF modules/rbf.b level1/init  modules/OS9p2 modules/OS9
+nitros9-code :
+	hg clone http://hg.code.sf.net/p/nitros9/code nitros9-code
 
--- a/os9/level1/Makefile	Tue Jul 17 10:55:16 2018 +0900
+++ b/os9/level1/Makefile	Tue Jul 17 11:42:58 2018 +0900
@@ -1,8 +1,8 @@
 
-OS9SRC=../../../../nitros9-code
-SRCDIR=$(OS9SRC)/level1/modules
-SRCCMD=$(OS9SRC)/level1/cmds
-SRCDIR2=$(OS9SRC)/level2/modules
+OS9SRC = ../nitros9-code
+SRCDIR = $(OS9SRC)/level1/modules
+SRCCMD = $(OS9SRC)/level1/cmds
+SRCDIR2 = $(OS9SRC)/level2/modules
 
 A09 = ../../a09 -I $(OS9SRC)/defs/
 
@@ -19,7 +19,7 @@
 # CoCoOS9's level1/os9p1.asm has wrong vector value, use our own
 
 pdisk : 
-	$(A09) pdisk.asm -o pdisk $(LST) $(LST)
+	$(A09) pdisk.asm -o pdisk $(LST) 
 
 #boot : boot.asm
 #	$(A09) boot.asm -o boot $(LST)
@@ -45,7 +45,7 @@
 
 # os9 level1 moduels
 
-shell : ${SRCCMD}/shell_21.asm 
+shell : $(SRCCMD)/shell_21.asm 
 	$(A09) $< -o $@ $(LST)
 
 mdir : ${SRCCMD}/mdir.asm
@@ -56,7 +56,7 @@
 
 os9p1 :
 	cat  ${OS9SRC}//defs/coco.d ${SRCDIR}/kernel/krn.asm > krn.asm
-	$(A09) -I ../../../../nitros9-code/level1/modules/kernel/ krn.asm  -o os9p1 $(LST)
+	$(A09) -I ../nitros9-code/level1/modules/kernel/ krn.asm  -o os9p1 $(LST)
 
 os9p2 :
 	$(A09) ${SRCDIR}/kernel/krnp2.asm -o os9p2 $(LST)
--- a/os9/level2/Makefile	Tue Jul 17 10:55:16 2018 +0900
+++ b/os9/level2/Makefile	Tue Jul 17 11:42:58 2018 +0900
@@ -1,4 +1,4 @@
-OS9SRC=../../../../nitros9-code
+OS9SRC=../nitros9-code
 SRCDIR=$(OS9SRC)/level2/modules
 SRCCMD=$(OS9SRC)/level1/cmds
 SRCCMD2=$(OS9SRC)/level2/cmds
--- a/os9/level2/defsfile	Tue Jul 17 10:55:16 2018 +0900
+++ b/os9/level2/defsfile	Tue Jul 17 11:42:58 2018 +0900
@@ -10,8 +10,8 @@
 NOS9MAJ   equ OS9Major
 NOS9MIN   equ OS9Minor
 
-         use   ../../../../nitros9-code/defs/coco.d
-         use   ../../../../nitros9-code/defs/os9.d
-         use   ../../../../nitros9-code/defs/scf.d
-         use   ../../../../nitros9-code/defs/rbf.d
+         use   ../../nitros9-code/defs/coco.d
+         use   ../../nitros9-code/defs/os9.d
+         use   ../../nitros9-code/defs/scf.d
+         use   ../../nitros9-code/defs/rbf.d