From 48c535b41a299714d3b442c5ab68cd5f29f6c99f Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Tue, 14 Feb 2012 21:12:04 -0700
Subject: [PATCH] Syntax new compiler with new runtime, sf, etc.

---
 src/etc/build-bands.sh |  5 +----
 src/etc/compile.scm    |  3 +++
 src/etc/compile.sh     | 32 ++++++++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/etc/build-bands.sh b/src/etc/build-bands.sh
index 55a777de8..f47f67fcb 100755
--- a/src/etc/build-bands.sh
+++ b/src/etc/build-bands.sh
@@ -26,12 +26,9 @@ set -e
 
 . etc/functions.sh
 
-FASL=`get_fasl_file`
-
 run_cmd_in_dir runtime ../microcode/scheme --library ../lib --heap 6000 \
-    --fasl "${FASL}" --batch-mode <<EOF
+    --band runtime.com --batch-mode <<EOF
 (begin
-  (disk-save "../lib/runtime.com")
   (load-option (quote compiler))
   (load-option (quote edwin))
   (disk-save "../lib/all.com"))
diff --git a/src/etc/compile.scm b/src/etc/compile.scm
index 30445eea4..810e2c0a0 100644
--- a/src/etc/compile.scm
+++ b/src/etc/compile.scm
@@ -34,6 +34,9 @@ USA.
 
 (define (compile-all-dirs compile-dir)
   (compile-boot-dirs compile-dir)
+  (compile-remaining-dirs compile-dir))
+
+(define (compile-remaining-dirs compile-dir)
   (compile-dir "sos")
   (with-working-directory-pathname "sos"
     (lambda ()
diff --git a/src/etc/compile.sh b/src/etc/compile.sh
index b491877a8..dd11ef8bd 100755
--- a/src/etc/compile.sh
+++ b/src/etc/compile.sh
@@ -26,8 +26,32 @@ set -e
 
 . etc/functions.sh
 
-run_cmd "${@}" --heap 6000 --stack 200 --batch-mode <<EOF
-(begin
-  (load "etc/compile.scm")
-  (compile-everything))
+run_cmd "${@}"<<EOF
+(load "etc/compile.scm")
+(compile-cref compile-dir)
+(for-each compile-dir '("runtime" "star-parser" "sf"))
+EOF
+
+FASL=`get_fasl_file`
+run_cmd_in_dir runtime ../microcode/scheme --batch-mode		\
+	--library ../lib --fasl $FASL <<EOF
+(disk-save "../lib/runtime.com")
+EOF
+
+# Syntax the new compiler in fresh (compiler) packages.  Use the new sf too.
+run_cmd ./microcode/scheme --batch-mode --library lib --band runtime.com <<EOF
+(load-option 'SF)
+(with-working-directory-pathname "compiler/"
+  (lambda () (load "compiler.sf")))
+EOF
+
+run_cmd "${@}"<<EOF
+(with-working-directory-pathname "compiler/"
+  (lambda () (load "compiler.cbf")))
+EOF
+
+run_cmd ./microcode/scheme --batch-mode --library lib --band runtime.com <<EOF
+(load-option 'COMPILER)
+(load "etc/compile.scm")
+(compile-remaining-dirs compile-dir)
 EOF
-- 
2.25.1