ccl updates stolen from adlai

GNUmakefile

@@ -10,19 +10,15 @@
 include GNUmakefile.vars
 
 #LISPBOX_LISP            := sbcl
-LISPBOX_LISP            := openmcl
+LISPBOX_LISP            := clozurecl
 GNU_LINUX_EMACS_VERSION := 23.2
 WINDOWS_EMACS_VERSION   := 23.2
 CLISP_VERSION           := 2.41
 ALLEGRO_VERSION         := 70_trial
 SBCL_VERSION            := 1.0.38
-#OPENMCL_VERSION         := 1.0
-OPENMCL_VERSION         := 070408
-OPENMCL_PLATFORM        := darwinx8664
-#OPENMCL_PLATFORM        := darwinppc
-OPENMCL_RELEASE         := snapshot
-#OPENMCL_SCRIPT         	:= openmcl
-OPENMCL_SCRIPT         	:= openmcl64
+CLOZURECL_VERSION       := 1.5
+CLOZURECL_PLATFORM	:= linuxx86
+CLOZURECL_SCRIPT	:= lx86cl
 SLIME_VERSION           := 20100514.151447
 PRACTICALS_VERSION      := 1.0.3
 PORTABLEASERVE_VERSION  := 1.2.35
@@ -40,7 +36,7 @@ endif
 clisp   := clisp-$(CLISP_VERSION)
 allegro := acl$(ALLEGRO_VERSION)
 sbcl    := sbcl-$(SBCL_VERSION)
-openmcl := openmcl-$(OPENMCL_PLATFORM)-$(OPENMCL_RELEASE)-$(OPENMCL_VERSION)
+clozurecl := ccl-$(CLOZURECL_VERSION)-$(CLOZURECL_PLATFORM)
 
 lisp       := $($(LISPBOX_LISP))
 slime      := slime-$(SLIME_VERSION)
@@ -109,7 +105,7 @@ $(LISPBOX_HOME)-source.tar.gz:
 	cp README.source $(prefix)
 	cp write-lispbox-el.sh $(prefix)
 	cp write-lispbox.sh $(prefix)
-	cp lispbox.bat $(prefix)
+	cp new-lispbox.bat $(prefix)
 	cp write-site-init-lisp.sh $(prefix)
 	(cd $(TOP); tar czf - $(LISPBOX_HOME)) > $@
 
@@ -172,7 +168,7 @@ distro := $(if $(JUST_LISP),$(distro_just_lisp),$(if $(NO_EMACS),$(distro_no_ema
 distro: $(distro)
 
 $(distro): lispbox
-	(cd $(TOP); tar czf - $(LISPBOX_HOME)) > $@
+	(cd $(TOP); zip --recurse-paths - $(LISPBOX_HOME)) > $@
 endif
 
 
@@ -214,13 +210,13 @@ $(lispbox_script_dir)/lispbox.bat: lispbox.bat
 	cp $< $@
 
 $(lispbox_script_dir)/lispbox.sh: write-lispbox.sh $(prefix)
-	SBCL_DIR=$(sbcl) OPENMCL_DIR=$(openmcl) $(SH) $< > $@
+	SBCL_DIR=$(sbcl) CLOZURECL_DIR=$(clozurecl) $(SH) $< > $@
 	chmod +x $@
 
 foo: $(lispbox_elisp_dir)/lispbox.el
 
 $(lispbox_elisp_dir)/lispbox.el: write-lispbox-el.sh $(if $(NO_EMACS),$(prefix),$(emacs))
-	SLIME_DIR=$(slime) SBCL_DIR=$(sbcl) OPENMCL_DIR=$(openmcl) $(SH) $< > $@
+	SLIME_DIR=$(slime) SBCL_DIR=$(sbcl) CLOZURECL_DIR=$(clozurecl) $(SH) $< > $@
 
 $(prefix)/$(slime)/site-init.lisp: write-site-init-lisp.sh $(prefix)/$(slime) 
 	PRACTICALS=$(practicals) PORTABLEASERVE=$(portableaserve) $(SH) $< > $@
@@ -251,10 +247,10 @@ endif
 
 
 $(prefix)/$(sbcl)/lispbox-register.el:    lisppath := (lispbox-list-to-filename (list (file-name-directory load-file-name) \"bin\" \"sbcl\"))
-$(prefix)/$(openmcl)/lispbox-register.el: lisppath := (lispbox-list-to-filename (list (file-name-directory load-file-name) \"scripts\" \"$(OPENMCL_SCRIPT)\"))
+$(prefix)/$(clozurecl)/lispbox-register.el: lisppath := (lispbox-list-to-filename (list (file-name-directory load-file-name) \"$(CLOZURECL_SCRIPT)\"))
 
 $(prefix)/%/lispbox-register.el: $(lisp)
-	echo "(push (list '$(lisp) (list $(lisppath))) slime-lisp-implementations)" > $@
+	echo "(push (list '$(LISPBOX_LISP) (list $(lisppath))) slime-lisp-implementations)" > $@
 	if [ ! -z "$(license)" ]; \
 	  then echo "(lispbox-install-lisp-license (list $(license)) \"$(*)\")" >> $@; \
 	fi
@@ -266,10 +262,7 @@ endif
 
 # Unpacking pre-built staging archives into prefix.
 
-components := $(emacs) $(allegro) $(clisp) $(sbcl) $(slime) $(practicals) $(portableaserve)
-ifeq ($(os),Darwin)
-components += $(openmcl)
-endif
+components := $(emacs) $(allegro) $(clisp) $(sbcl) $(slime) $(practicals) $(portableaserve) $(clozurecl)
 
 
 $(components): %: staging-archives/%.tar.gz $(prefix)
@@ -283,7 +276,7 @@ $(sbcl): staging-archives/$(sbcl).tar.gz $(prefix)
 staging-archives/$(emacs).tar.gz:          makefile := GNUmakefile.emacs
 staging-archives/$(allegro).tar.gz:        makefile := GNUmakefile.allegro
 staging-archives/$(clisp).tar.gz:          makefile := GNUmakefile.clisp
-staging-archives/$(openmcl).tar.gz:        makefile := GNUmakefile.openmcl
+staging-archives/$(clozurecl).tar.gz:        makefile := GNUmakefile.clozurecl
 staging-archives/$(sbcl).tar.gz:           makefile := GNUmakefile.sbcl
 staging-archives/$(slime).tar.gz:          makefile := GNUmakefile.slime
 staging-archives/$(practicals).tar.gz:     makefile := GNUmakefile.practicals

GNUmakefile.clozurecl

@@ -0,0 +1,19 @@
+#VERSION=$(subst openmcl-,,$(THING))
+VERSION=$(THING)
+
+all: staging-archives/$(THING).tar.gz
+
+include GNUmakefile.base
+
+ifneq ($(os),Windows)
+staging-archives/$(THING).tar.gz: binary-archives/$(THING).tar.gz
+	cat $< | (cd $(prefix); tar xzf -; mv ccl $(THING))
+	(cd $(prefix); tar czf - $(THING)) > $@
+else
+staging-archives/$(THING).tar.gz: staging/$(THING)
+	(cd staging; tar czf - $(THING)) > $@
+
+staging/$(THING): binary-archives/$(THING).zip
+	unzip $< -d staging; cd staging; mv ccl $(THING)
+endif
+

GNUmakefile.distros

@@ -1,15 +1,11 @@
 include GNUmakefile.vars
 
-lisps := clisp
+lisps := clisp clozurecl
 
 ifneq ($(os),Windows)
 lisps += allegro sbcl
 endif
 
-ifeq ($(os),Darwin)
-lisps += openmcl
-endif
-
 all: $(lisps)
 
 $(lisps):

GNUmakefile.emacs

@@ -44,7 +44,7 @@ ifeq ($(os),Windows)
 staging-archives/$(THING).tar.gz: staging/$(THING)
 	(cd staging; tar czf - $(THING)) > $@
 
-staging/$(THING): binary-archives/$(THING)-fullbin-i386.tar.gz 
+staging/$(THING): binary-archives/$(THING)-bin-i386.zip
 	cat $< | (cd staging; tar xzf -)
 
 endif

new-lispbox.bat

@@ -1,31 +1,31 @@
-@echo off
-if NOT %OS%==Windows_NT goto checkhome
-for %%i in ( "%CD%" ) do set LISPBOX_HOME=%%~si%
-
-echo lispbox home is set to %LISPBOX_HOME%
-goto start
-
-:checkhome
-
-rem
-rem if the environment variable is not defined, dereferencing
-rem it produces the same string!
-rem
-
-if %LISPBOX_HOME%==%LISPBOX_HOME% goto noenv
-:start
-
-set EMACS=%LISPBOX_HOME%/emacs-21.3/bin/runemacs.exe
-set TO_EVAL="(progn (load \"lispbox\") (slime))"
-
-%EMACS% --no-init-file --no-site-file --eval=%TO_EVAL%
-
-goto end
-
-:noenv
-
-echo LISPBOX_HOME environment variable should be set and
-echo point to the installation directory of LISPBOX before
-echo launching this command.  
-
-:end
+@echo off
+rem Thanks to Venkat who provided this bit of COMMAND wizardry.
+
+if NOT %OS%==Windows_NT goto checkhome
+for %%i in ( "%CD%" ) do set LISPBOX_HOME=%%~si%
+goto start
+
+:checkhome
+
+rem
+rem if the environment variable is not defined, dereferencing
+rem it produces the same string!
+rem
+
+if %LISPBOX_HOME%==%LISPBOX_HOME% goto noenv
+:start
+
+set EMACS=%LISPBOX_HOME%/emacs-23.1/bin/runemacs.exe
+set TO_EVAL="(progn (load \"lispbox\") (slime))"
+
+%EMACS% --no-init-file --no-site-file --eval=%TO_EVAL%
+
+goto end
+
+:noenv
+
+echo LISPBOX_HOME environment variable should be set and
+echo point to the installation directory of LISPBOX before
+echo launching this command.
+
+:end

write-lispbox-el.sh

@@ -41,9 +41,9 @@ if [ ! -z "${SBCL_DIR}" ]; then
 EOF
 fi
 
-if [ ! -z "${OPENMCL_DIR}" ]; then
+if [ ! -z "${CLOZURECL_DIR}" ]; then
     cat <<EOF
-(setenv "CCL_DEFAULT_DIRECTORY" (lispbox-file "${OPENMCL_DIR}"))
+(setenv "CCL_DEFAULT_DIRECTORY" (lispbox-file "${CLOZURECL_DIR}"))
 EOF
 fi