Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv27650
Modified Files: clhp.lisp cgi.lisp TODO Makefile ChangeLog .cvsignore Added Files: package.lisp clhp.asd Log Message: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about.
Date: Fri Oct 17 08:58:04 2003 Author: aventimiglia
Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.15 clhp/clhp.lisp:1.16 --- clhp/clhp.lisp:1.15 Thu Oct 16 15:31:59 2003 +++ clhp/clhp.lisp Fri Oct 17 08:58:04 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.15 2003/10/16 19:31:59 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.16 2003/10/17 12:58:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,17 +21,18 @@ ;; email: aventimiglia@common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/
-(eval-when (:compile-toplevel) - (unless (find-package :cgi) - (load "cgi"))) +;(eval-when (:compile-toplevel) +; (unless (find-package :cgi) +; (load "cgi"))) + +;(defpackage #:net.common-lisp.aventimiglia.clhp +; (:nicknames :clhp) +; (:use :cgi :cl) +; (:import-from :cgi #:cond-bind #:list-to-a-list) +; (:export #:parse #:*clhp-version* #:echo #:include #:xml-element +; #:make-xml-element #:copy-xml-element #:xml-element-attributes +; #:xml-element-name #:xml-element-contents #:xml-element-p #:tag))
-(defpackage #:net.common-lisp.aventimiglia.clhp - (:nicknames :clhp) - (:use :cgi :cl) - (:import-from :cgi #:cond-bind #:list-to-a-list) - (:export #:parse #:*clhp-version* #:echo #:include #:xml-element - #:make-xml-element #:copy-xml-element #:xml-element-attributes - #:xml-element-name #:xml-element-contents #:xml-element-p #:tag)) (in-package :clhp)
;; This elaborate reader macro converts the cvs Date keywords and @@ -40,7 +41,7 @@ ;; will override the CVS keyword (defconstant *CLHP-VERSION* #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/16 19:31:59 $")) + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/17 12:58:04 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4)
Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.10 clhp/cgi.lisp:1.11 --- clhp/cgi.lisp:1.10 Wed Oct 15 10:44:04 2003 +++ clhp/cgi.lisp Fri Oct 17 08:58:04 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.10 2003/10/15 14:44:04 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.11 2003/10/17 12:58:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -20,10 +20,10 @@ ;; email: aventimiglia@common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/
-(defpackage #:net.common-lisp.aventimiglia.cgi - (:nicknames #:cgi) - (:use :cl) - (:export #:*server-env* #:*query-vars* #:header #:debug #:init)) +;(defpackage #:net.common-lisp.aventimiglia.cgi +; (:nicknames #:cgi) +; (:use :cl) +; (:export #:*server-env* #:*query-vars* #:header #:debug #:init))
(in-package :cgi)
Index: clhp/TODO diff -u clhp/TODO:1.7 clhp/TODO:1.8 --- clhp/TODO:1.7 Wed Oct 15 10:44:04 2003 +++ clhp/TODO Fri Oct 17 08:58:04 2003 @@ -1,4 +1,6 @@ -$Id: TODO,v 1.7 2003/10/15 14:44:04 aventimiglia Exp $ -*- outline -*- +$Id: TODO,v 1.8 2003/10/17 12:58:04 aventimiglia Exp $ -*- outline -*- + +* Use ASDF for package building
* Convert *QUERY-VARS* and *SERVER-ENV* to hashes I should probably make interface functions to access them, actually @@ -7,7 +9,7 @@
* Test suite ** Complete suite for :cgi -** Write suite for :clhp +** Complete suite for :clhp ** Refine :test-suite
* COMPILE-CGI
Index: clhp/Makefile diff -u clhp/Makefile:1.14 clhp/Makefile:1.15 --- clhp/Makefile:1.14 Thu Oct 16 15:40:18 2003 +++ clhp/Makefile Fri Oct 17 08:58:04 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.14 2003/10/16 19:40:18 aventimiglia Exp $ +# $Id: Makefile,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -57,8 +57,9 @@
LISPC=$(LISP) -noinit -load config/lispc -eval '(make)'
-SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp -LIBS=cgi.x86f clhp.x86f start-clcgi.x86f +BUILD_CORE=config/build-core.x86f +BINS=start-clcgi.x86f +SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp package.lisp clhp.asd CORE=clhp.core LISPCBIN=config/lispc.x86f RUNCGI=config/runclcgi @@ -84,7 +85,7 @@ # makefile most likeley will not match the cvs version ID in # clhp.lisp, since they depend on their own file's cvs date keyword.
-CVSID=$(shell echo $Date: 2003/10/16 19:40:18 $ | \ +CVSID=$(shell echo $Date: 2003/10/17 12:58:04 $ | \ awk '{print $$2}'| sed s/\///g )cvs
VERSION=$(CVSID) @@ -94,7 +95,7 @@
RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive
-all: $(LISPCBIN) $(LIBS) $(CORE) $(RUNCGI) +all: $(LISPCBIN) $(CORE) $(RUNCGI) $(BINS)
.PHONY: all install uninstall clean clean-all clean-backups install-dirs \ install-source install-source-dirs uninstall-files uninstall-dirs \ @@ -115,8 +116,8 @@
$(LISPCBIN): config/lispc.lisp
-$(CORE): $(SOURCES) config/build-core.lisp - $(LISP) -noinit -eval '(load (open "config/build-core.lisp"))' +$(CORE): $(SOURCES) $(BUILD_CORE) + $(LISP) -noinit -load "config/build-core"
$(RUNCGI): $(RUNCGI).src sed 's:(LISP=):\1$(LISP):' < $< | \ @@ -124,7 +125,7 @@ sed 's:(CMUCLLIB=):\1$(LIBDIR):' > $@
install: all install-dirs install-core - for f in $(LIBS); do \ + for f in $(BINS) ; do \ $(INSTALLFILE) $$f $(LIBDIR) ; \ done $(INSTALL) $(DOCS) $(DOCDIR) @@ -194,11 +195,12 @@ clean-all: clean-all-recursive clean clean-backups clean-dist
clean: clean-recursive - for f in $(LIBS) $(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) \ + for f in $(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) \ $(TESTS) $(TARBALL); \ do \ if test -f $$f ; then rm -v $$f ; fi \ done + find -iname "*.x86f" -exec rm -v {} ; $(MAKE) -C examples clean find -iname "*.tar.gz" -exec rm -v {} ;
Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.14 clhp/ChangeLog:1.15 --- clhp/ChangeLog:1.14 Thu Oct 16 12:57:25 2003 +++ clhp/ChangeLog Fri Oct 17 08:58:04 2003 @@ -1,3 +1,9 @@ +2003-10-17 ant@afghan.dogpound + + * clhp.asd, package.lisp, clhp.lisp, cgi.lisp: Converted all this + to an ASDF system, it's not quite battle tested, but hey, that's + what this is all about. + 2003-10-16 ant@afghan.dogpound
* tests/clhp-test.lisp (*CLHP-TESTS*): Wrote tests for most of @@ -91,4 +97,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments.
-$Id: ChangeLog,v 1.14 2003/10/16 16:57:25 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ \ No newline at end of file
Index: clhp/.cvsignore diff -u clhp/.cvsignore:1.1 clhp/.cvsignore:1.2 --- clhp/.cvsignore:1.1 Tue Oct 14 00:33:41 2003 +++ clhp/.cvsignore Fri Oct 17 08:58:04 2003 @@ -1,4 +1,5 @@ cgi.x86f clhp.core clhp.x86f +package.x86f start-clcgi.x86f