From 55623756a9a08851f5b86aac5adea1c9d5a4da9c Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Wed, 15 Feb 2012 13:03:54 -0700
Subject: [PATCH] Syntax boot (LIAR/C) compiler with new runtime, sf, etc.

---
 src/etc/build-bands.sh           | 13 ++++++++---
 src/etc/c-prepare.sh             |  9 +++++--
 src/etc/compile-boot-compiler.sh | 40 +++++++++++++++++++++++++-------
 3 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/etc/build-bands.sh b/src/etc/build-bands.sh
index f47f67fcb..a8f933768 100755
--- a/src/etc/build-bands.sh
+++ b/src/etc/build-bands.sh
@@ -26,10 +26,17 @@ set -e
 
 . etc/functions.sh
 
-run_cmd_in_dir runtime ../microcode/scheme --library ../lib --heap 6000 \
-    --band runtime.com --batch-mode <<EOF
+if [ ! -e lib/runtime.com ]; then
+  FASL=`get_fasl_file`
+  run_cmd_in_dir runtime \
+	../microcode/scheme --batch-mode --library ../lib --fasl $FASL <<EOF
+(disk-save "../lib/runtime.com")
+EOF
+fi
+
+run_cmd ./microcode/scheme --batch-mode --library lib --band runtime.com <<EOF
 (begin
   (load-option (quote compiler))
   (load-option (quote edwin))
-  (disk-save "../lib/all.com"))
+  (disk-save "lib/all.com"))
 EOF
diff --git a/src/etc/c-prepare.sh b/src/etc/c-prepare.sh
index 04eec0107..84aaa5126 100755
--- a/src/etc/c-prepare.sh
+++ b/src/etc/c-prepare.sh
@@ -33,8 +33,13 @@ else
     exit 1
 fi
 
-run_cmd "${EXE}" --band runtime.com --heap 6000 --stack 200 <<EOF
+run_cmd "${EXE}" --batch-mode --library lib --band x-compiler.com <<EOF
 (begin
   (load "etc/compile.scm")
-  (c-prepare))
+  (in-liarc
+   (lambda ()
+     (compile-boot-dirs c-compile-dir))))
 EOF
+
+# distclean will not get these...
+run_cmd ./Stage.sh remove X
diff --git a/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
index 2759e0d1e..cbafc486f 100755
--- a/src/etc/compile-boot-compiler.sh
+++ b/src/etc/compile-boot-compiler.sh
@@ -33,14 +33,38 @@ else
     exit 1
 fi
 
-run_cmd "${EXE}" --band runtime.com --heap 6000 <<EOF
-(begin
-  (load "etc/compile.scm")
-  (compile-bootstrap-1))
+run_cmd "${EXE}" --batch-mode <<EOF
+(load "etc/compile.scm")
+(compile-cref compile-dir)
+(for-each compile-dir '("runtime" "star-parser" "sf"))
 EOF
 
-run_cmd "${EXE}" --band all.com --heap 6000 <<EOF
-(begin
-  (load "etc/compile.scm")
-  (compile-bootstrap-2))
+FASL=`get_fasl_file`
+run_cmd_in_dir runtime "${EXE}" --batch-mode --library ../lib --fasl $FASL <<EOF
+(disk-save "../lib/x-runtime.com")
 EOF
+echo ""
+
+run_cmd "${EXE}" --batch-mode --library lib --band x-runtime.com <<EOF
+(load-option 'SF)
+(with-working-directory-pathname "compiler"
+  (lambda ()
+    (load "compiler.sf")))
+EOF
+
+run_cmd "${EXE}" --batch-mode <<EOF
+(with-working-directory-pathname "compiler"
+  (lambda ()
+    (load "compiler.cbf")))
+EOF
+
+run_cmd "${EXE}" --batch-mode --library lib --band x-runtime.com <<EOF
+(load-option 'SF)
+(load-option 'CREF)
+(load-option '*PARSER)
+(load-option 'COMPILER)
+(disk-save "lib/x-compiler.com")
+EOF
+
+# Remove host (native) code to STAGEX/ subdirs.
+run_cmd ./Stage.sh make X
-- 
2.25.1