From aea6f6d342e41063e08b45eb817d08eca7033a7c Mon Sep 17 00:00:00 2001
From: Christophe Rhodes <csr21@cantab.net>
Date: Fri, 22 Apr 2022 15:46:49 +0100
Subject: [PATCH] Adjust freeze script

Now that CCL/SBCL fasl binary equivalence is tracked by CI, make
building from CCL optional during freeze, and build locally using
CLISP instead.
---
 freeze.sh | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/freeze.sh b/freeze.sh
index 96020a5f7..632f2a7d0 100644
--- a/freeze.sh
+++ b/freeze.sh
@@ -23,6 +23,7 @@ usage: $0 VERSION
   SBCL_RELEASE_DIR: Absolute path to directory containing all the build
     artifacts. If not defined, a new build directory is created in \$PWD.
   CCL: Path to Clozure Common Lisp, suitable as an argument to make.sh
+  CLISP: Path to CLISP, suitable as an argument to make.sh
 EOF
     exit 1
 }
@@ -40,9 +41,9 @@ then
     usage "Extra command-line arguments: $@"
 fi
 
-if [ -z "$CCL" ]
+if [ -z "$CLISP" ]
 then
-    usage "CCL environment variable not set"
+    usage "CLISP environment variable not set"
 fi
 
 SBCL_RELEASE_DIR=${SBCL_RELEASE_DIR:-$(mktemp -d $PWD/sbcl-release-dir-$(date +%Y%m%d)-XXXXXXXXX)}
@@ -131,18 +132,29 @@ fi
 
 # check build from ccl
 
-if [ ! -d $SBCL_RELEASE_DIR/obj_from-xc_ccl ]; then
-   cd $SBCL_DIR
-   sh clean.sh
-   nice -20 ./make.sh "$CCL" >> $LOGFILE 2>&1
-   cd $SBCL_RELEASE_DIR
+if [ -n "$CCL" ]; then
+    if [ ! -d $SBCL_RELEASE_DIR/obj_from-xc_ccl ]; then
+        cd $SBCL_DIR
+        sh clean.sh
+        nice -20 ./make.sh "$CCL" >> $LOGFILE 2>&1
+        cd $SBCL_RELEASE_DIR
 
-   mv $SBCL_DIR/obj/from-xc obj_from-xc_ccl
+        mv $SBCL_DIR/obj/from-xc obj_from-xc_ccl
+    fi
 fi
 
-# TODO: check binary-equality between ccl, sbcl objs
+if [ ! -d $SBCL_RELEASE_DIR/obj_from-xc_clisp ]; then
+   cd $SBCL_DIR
+   sh clean.sh
+   nice -20 ./make.sh "$CLISP" >> $LOGFILE 2>&1
+   cd $SBCL_RELEASE_DIR
 
-# TODO: check build from clisp, abcl
+   mv $SBCL_DIR/obj/from-xc obj_from-xc_clisp
+fi
+
+# TODO: check binary-equality between ccl, clisp, sbcl objs
+
+# TODO: check build from abcl, ecl
 
 # upload rc build