add quicklisp, temporarily disable practicals

andreer · Oct 9, 2010 · 215de61 · 215de61
1 parent cd12339
commit 215de61
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -19,8 +19,9 @@ SBCL_VERSION            := 1.0.42
 CLOZURECL_VERSION       := 1.5
 CLOZURECL_PLATFORM	:= darwinx86
 CLOZURECL_SCRIPT	:= dx86cl64
-SLIME_VERSION           := 20100905.081054
+SLIME_VERSION           := 20101009.090831
 PRACTICALS_VERSION      := 1.0.3
+QUICKLISP_VERSION	:= beta-2010-10-09
 
 ifeq ($(os),Linux)
 emacs := emacs-$(GNU_LINUX_EMACS_VERSION)
@@ -40,6 +41,7 @@ clozurecl := ccl-$(CLOZURECL_VERSION)-$(CLOZURECL_PLATFORM)
 lisp       := $($(LISPBOX_LISP))
 slime      := slime-$(SLIME_VERSION)
 practicals := practicals-$(PRACTICALS_VERSION)
+quicklisp  := quicklisp-$(QUICKLISP_VERSION)
 
 ifeq ($(os),Darwin)
 lispbox_script_dir := $(prefix)/Emacs.app/Contents/MacOS
@@ -180,7 +182,8 @@ endif # Darwin
 endif # not NO_EMACS
 
 lispbox: $(slime)
-lispbox: $(practicals)
+# lispbox: $(practicals)
+lispbox: $(quicklisp)
 lispbox: $(prefix)/$(slime)/site-init.lisp
 lispbox: $(lispbox_elisp_dir)/lispbox.el 
 lispbox: $(prefix)/asdf.lisp 
@@ -253,7 +256,7 @@ endif
 
 # Unpacking pre-built staging archives into prefix.
 
-components := $(emacs) $(allegro) $(clisp) $(sbcl) $(slime) $(practicals) $(clozurecl)
+components := $(emacs) $(allegro) $(clisp) $(sbcl) $(slime) $(practicals) $(quicklisp) $(clozurecl)
 
 
 $(components): %: staging-archives/%.tar.gz $(prefix)
@@ -271,6 +274,7 @@ 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
+staging-archives/$(quicklisp).tar.gz:      makefile := GNUmakefile.quicklisp
 
 staging-archives/%.tar.gz:
 	$(MAKE) -f $(makefile) THING=$*

diff --git a/GNUmakefile.quicklisp b/GNUmakefile.quicklisp
@@ -0,0 +1,6 @@
+all: staging-archives/$(THING).tar.gz
+
+include GNUmakefile.base
+
+staging-archives/$(THING).tar.gz: binary-archives/$(THING).tar.gz
+	cp $< $@
diff --git a/write-site-init-lisp.sh b/write-site-init-lisp.sh
@@ -37,24 +37,26 @@ cat <<EOF
     :type nil
     :defaults *load-pathname*)))
 
-#-asdf
-(progn
-  (multiple-value-bind (value error)
-      (ignore-errors (require :asdf))
-    (if error
-      (load (lispbox-file (make-pathname :name "asdf" :type "lisp"))))))
+(load (lispbox-file (make-pathname :directory '(:relative "quicklisp") :name "setup" :type "lisp")))
+
+;#-asdf
+;(progn
+;  (multiple-value-bind (value error)
+;      (ignore-errors (require :asdf))
+;    (if error
+;      (load (lispbox-file (make-pathname :name "asdf" :type "lisp"))))))
 
-(load (lispbox-file (make-pathname :name "asdf-extensions" :type "lisp")))
+;(load (lispbox-file (make-pathname :name "asdf-extensions" :type "lisp")))
 
 ;;; Clean up CL-USER package
 (loop with cl = (find-package :cl)
    for p in (package-use-list :cl-user) 
    unless (eql p cl) do (unuse-package p :cl-user))
-(use-package :asdf :cl-user)
-(use-package :com.gigamonkeys.asdf-extensions :cl-user)
+;(use-package :asdf :cl-user)
+;(use-package :com.gigamonkeys.asdf-extensions :cl-user)
 
 EOF
 
-cat <<EOF
-(register-source-directory (lispbox-file (make-pathname :directory '(:relative "${PRACTICALS}"))))
-EOF
+#cat <<EOF
+#(register-source-directory (lispbox-file (make-pathname :directory '(:relative "${PRACTICALS}"))))
+#EOF