Second stage of complete build.

Makefile

@@ -42,6 +42,13 @@ out/klh10/stamp out/simh/stamp: $(OUT)/rp0.dsk
 out/sims/stamp: $(OUT)/rp03.2 $(OUT)/rp03.3
 	touch $@
 
+stage2: $(OUT)/stamp2
+
+$(OUT)/stamp2: $(OUT)/stamp
+	mv $(OUT)/output.tape $(OUT)/stage1.tape
+	STAGE2=yes PATH=${PWD}/tools/simh/BIN:$$PATH expect -f build/$(EMULATOR)/build.tcl $(IP) $(GW)
+	touch $<
+
 $(OUT)/rp0.dsk: build/simh/init $(OUT)/minsys.tape $(OUT)/salv.tape $(OUT)/dskdmp.tape build/build.tcl $(OUT)/sources.tape build/$(EMULATOR)/stamp
 	PATH=${PWD}/tools/simh/BIN:$$PATH expect -f build/$(EMULATOR)/build.tcl $(IP) $(GW)
 

build/build.tcl

@@ -4,6 +4,12 @@ if {![info exists env(BASICS)]} {
     set env(BASICS) "no"
 }
 
+# If the environment variable STAGE2 is set to "yes", build everything
+# that was not built in the basics stage.
+if {![info exists env(STAGE2)]} {
+    set env(STAGE2) "no"
+}
+
 proc abort {} {
     puts ""
     puts "The last command timed out."
@@ -112,26 +118,36 @@ expect_after timeout abort
 set ip [ip_address [lindex $argv 0]]
 set gw [ip_address [lindex $argv 1]]
 
-source build/mark.tcl
+if {$env(STAGE2)!="yes"} {
+    source $build/mark.tcl
+} else {
+    start_emulator
+    start_dskdmp
+    expect "\n"; type "its\r"
+}
 
 expect "\n"; type "\033g"
 pdset
 
 respond "*" ":login db\r"
 sleep 1
+type ":vk\r"
 
-source build/basics.tcl
+if {$env(STAGE2)!="yes"} {
+    source $build/basics.tcl
+}
 
 if {$env(BASICS)!="yes"} {
     source $build/misc.tcl
     source $build/lisp.tcl
     source $build/scheme.tcl
+    source $build/muddle.tcl
+    source $build/sail.tcl
 }
 
-source $build/muddle.tcl
+if {$env(STAGE2)!="yes"} {
-source $build/sail.tcl
+    bootable_tapes
-
+}
-bootable_tapes
 
 # make output.tape
 
@@ -140,7 +156,11 @@ create_tape "$out/output.tape"
 type ":dump\r"
 respond "_" "dump links full list\r"
 respond "LIST DEV =" "tty\r"
-respond "TAPE NO=" "1\r"
+if {$env(STAGE2)!="yes"} {
+    respond "TAPE NO=" "1\r"
+} else {
+    respond "TAPE NO=" "2\r"
+}
 expect -timeout 3000 "REEL"
 respond "_" "rewind\r"
 respond "_" "icheck\r"

build/klh10/build.tcl

@@ -5,6 +5,10 @@ cd build/klh10
 set emulator_prompt "KLH10"
 set emulator_escape "\034"
 
+proc start_emulator {} {
+    uplevel #0 {spawn ./kn10-ks-its nsalv.ini}
+}
+
 proc start_salv {} {
     uplevel #0 {spawn ./kn10-ks-its nsalv.ini}
     expect "EOF"

build/simh/build.tcl

@@ -2,6 +2,10 @@ set build [pwd]/build
 set out "out/$env(EMULATOR)"
 set emulator_escape "\034"
 
+proc start_emulator {} {
+    uplevel #0 {spawn pdp10 build/simh/init}
+}
+
 proc start_salv {} {
     uplevel #0 {spawn pdp10 build/simh/init}
     respond "sim>" "show ver\r"

build/sims/build.tcl

@@ -2,6 +2,10 @@ set build [pwd]/build
 set out "out/$env(EMULATOR)"
 set emulator_escape "\034"
 
+proc start_emulator {} {
+    uplevel #0 {spawn ./tools/sims/BIN/ka10 build/sims/init}
+}
+
 proc start_salv {} {
     uplevel #0 {spawn ./tools/sims/BIN/ka10 build/sims/init}
     expect "MAGDMP\r\n"; send "l\033ddt\r"