clhp-cvs

clhp-cvs@common-lisp.net

120 discussions

[clhp-cvs] CVS update: public_html/index.clhp public_html/funcs.lisp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv16152 Modified Files: index.clhp funcs.lisp Log Message: Got most of the functions that will be used to make thesite working Date: Thu Nov 13 11:21:41 2003 Author: aventimiglia Index: public_html/index.clhp diff -u public_html/index.clhp:1.4 public_html/index.clhp:1.5 --- public_html/index.clhp:1.4 Thu Nov 13 10:33:14 2003 +++ public_html/index.clhp Thu Nov 13 11:21:40 2003 @@ -15,6 +15,14 @@ (require "funcs.lisp")) (use-package :www) +;; Page sections are all defined here each section is a list, with the +;; CAR as the section name and the CDR as the section contents. +(setq *page-sections* + '(("Introduction" + "CLHP combines the joys of common Lisp with the ease of PHP for web development") + ("Current version" + "The latest version is 0.2.0alpha"))) + ;; Start of page output (echon +doctype+) @@ -23,12 +31,8 @@ (list (head "CLHP the Common Lisp Hypertext Preprocessor") (tag '|body| - (list - (page-header "CLHP" "the Common Lisp Hypertext Preprocessor")))))) + (page-body))))) - - - ;(defvar *title* "CLHP the Common Lisp Hypertext Preprocessor") ;(defvar *readme* "/home/ant/src/clhp/README") Index: public_html/funcs.lisp diff -u public_html/funcs.lisp:1.1 public_html/funcs.lisp:1.2 --- public_html/funcs.lisp:1.1 Thu Nov 13 10:33:14 2003 +++ public_html/funcs.lisp Thu Nov 13 11:21:40 2003 @@ -1,4 +1,4 @@ -;; $Id: funcs.lisp,v 1.1 2003/11/13 15:33:14 aventimiglia Exp $ +;; $Id: funcs.lisp,v 1.2 2003/11/13 16:21:40 aventimiglia Exp $ ;; ;; Functions used on clhp website ;; at http://common-lisp.net/project/clhp @@ -7,7 +7,8 @@ (defpackage :net.common-lisp.aventimiglia.clhp.www (:nicknames #:www) (:use #:cl #:clhp) - (:export #:+doctype+ #:echon #:head #:page-header)) + (:export #:+doctype+ #:echon #:head #:*page-sections* + #:page-body)) (in-package :www) @@ -16,11 +17,16 @@ (defconstant +header-links+ '(("http://common-lisp.net/" "Common-Lisp.net"))) -(defvar *site-links* +(defconstant +site-links+ '(("http://common-lisp.net/cgi-bin/viewcvs.cgi/clhp/?cvsroot=clhp" "ViewCVS") ("ftp://common-lisp.net/pub/project/clhp/" "Downloads"))) +(defvar *page-sections* nil + "These are the text sections of the page. Each section is a element +list, where the CAR is the Section name and the CDR is the content.") + + (declaim (inline echon head)) (defun echon (&rest args) @@ -46,7 +52,31 @@ (tag '|span| '|class| "headerTitle" (list caption " ")) (tag '|span| '|class| "headerSubTitle" subtitle) (tag '|div| '|class| "headerLinks" (make-links +header-links+)) - (tag '|div| '|class| "siteMap" (make-links *site-links*))))) - + (tag '|div| '|class| "siteMap" (make-links +site-links+))))) + +(defun page-body () + (list + (page-header "CLHP" "the Common Lisp Hypertext Preprocessor") + (page-menu) + (tag '|div| '|id| "bodyText" + (loop for section in *page-sections* + nconcing (make-page-section section))))) + +(defun make-page-section (section) + (let ((name (car section))) + (cons + (tag '|h1| '|id| name name) + (loop for p in (cdr section) + collect (tag '|p| p))))) + +(defun page-menu () + (if *page-sections* + (tag '|div| '|class| "sideBox LHS" + (make-links (loop for section in *page-sections* + collect (let ((name (car section))) + (list (format nil "#~A" name) name))))) + "")) + +

1 0

[clhp-cvs] CVS update: public_html/style.css public_html/funcs.lisp public_html/index.clhp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv25925 Modified Files: index.clhp Added Files: style.css funcs.lisp Log Message: Working on the new, nice page. Date: Thu Nov 13 10:33:14 2003 Author: aventimiglia Index: public_html/index.clhp diff -u public_html/index.clhp:1.3 public_html/index.clhp:1.4 --- public_html/index.clhp:1.3 Mon Sep 29 13:21:11 2003 +++ public_html/index.clhp Thu Nov 13 10:33:14 2003 @@ -1,7 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "xhtml1-strict.dtd"> <?clhp - ;; Since the server is not yet equipped with CLHP, I will build run ;; these pages through the CLHP parser, and use the resulting pages ;; for the web site with the following command: @@ -13,47 +11,66 @@ |# ;; The HTTP Headers will have to be deleted from the resulting file. -(defvar *title* "CLHP the Common Lisp Hypertext Preprocessor") -(defvar *readme* "/home/ant/src/clhp/README") -(defvar *links* '(("Download" "ftp://common-lisp.net/pub/project/clhp"))) - - -(defun dump-text-file (file-name) - (with-open-file - (stream file-name :direction :input :if-does-not-exist :error) - (let* ((buffer-size (file-length stream)) - (buffer (make-array buffer-size :element-type 'character))) - (read-sequence buffer stream) - buffer))) +(unless (find-package :www) + (require "funcs.lisp")) +(use-package :www) -(defun link (pair) - "Takes a cons pair (CONTENT URI) and forms a link." - (tag "a" "href" (cadr pair) (car pair))) +;; Start of page output +(echon +doctype+) -(echo - (tag "html" +(echon + (tag '|html| (list - (tag "head" - (tag "title" *title*)) - (tag "body" + (head "CLHP the Common Lisp Hypertext Preprocessor") + (tag '|body| (list - (tag "h1" *title*) - (tag "hr") - (tag "p" (list - "I apologize for the lack of content on this site, " - "CLHP is still in it's early stages, so this simply " - "contains the README file, with the addition of some " - "extra links")) - (tag "p" - (list - "To get the latest version, click the " - (link (assoc "Download" *links* :test #'string=)) - " link. To checkout the CVS via anonymous pserver cvs, use " - (tag "b" (list - "anonymous@common-lisp.net:/project/clhp/cvsroot " - "co clhp")))) - (tag "h3" "README") - (tag "hr") - (tag "pre" (dump-text-file *readme*))))))) -(format t "~&") + (page-header "CLHP" "the Common Lisp Hypertext Preprocessor")))))) + + + + + +;(defvar *title* "CLHP the Common Lisp Hypertext Preprocessor") +;(defvar *readme* "/home/ant/src/clhp/README") +;(defvar *links* '(("Download" "ftp://common-lisp.net/pub/project/clhp"))) +; +; +;(defun dump-text-file (file-name) +; (with-open-file +; (stream file-name :direction :input :if-does-not-exist :error) +; (let* ((buffer-size (file-length stream)) +; (buffer (make-array buffer-size :element-type 'character))) +; (read-sequence buffer stream) +; buffer))) +; +;(defun link (pair) +; "Takes a cons pair (CONTENT URI) and forms a link." +; (tag "a" "href" (cadr pair) (car pair))) +; +;(echo +; (tag "html" +; (list +; (tag "head" +; (tag "title" *title*)) +; (tag "body" +; (list +; (tag "h1" *title*) +; (tag "hr") +; (tag "p" (list +; "I apologize for the lack of content on this site, " +; "CLHP is still in it's early stages, so this simply " +; "contains the README file, with the addition of some " +; "extra links")) +; (tag "p" +; (list +; "To get the latest version, click the " +; (link (assoc "Download" *links* :test #'string=)) +; " link. To checkout the CVS via anonymous pserver cvs, use " +; (tag "b" (list +; "anonymous@common-lisp.net:/project/clhp/cvsroot " +; "co clhp")))) +; (tag "h3" "README") +; (tag "hr") +; (tag "pre" (dump-text-file *readme*))))))) +;(format t "~&") ?>

1 0

[clhp-cvs] CVS update: clhp/clhp.lisp clhp/clhp.asd clhp/Makefile
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv9587 Modified Files: clhp.lisp clhp.asd Makefile Log Message: post release version updates Date: Thu Nov 13 00:10:40 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.19 clhp/clhp.lisp:1.20 --- clhp/clhp.lisp:1.19 Wed Nov 12 23:57:44 2003 +++ clhp/clhp.lisp Thu Nov 13 00:10:40 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.19 2003/11/13 04:57:44 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.20 2003/11/13 05:10:40 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -28,8 +28,8 @@ ;; by changing the NIL in the first part of the OR, a release number ;; will override the CVS keyword (defconstant *CLHP-VERSION* - #.(or "0.2.0alpha" ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 04:57:44 $")) + #.(or nil ; Set this for releases + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 05:10:40 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/clhp.asd diff -u clhp/clhp.asd:1.3 clhp/clhp.asd:1.4 --- clhp/clhp.asd:1.3 Wed Nov 12 23:57:44 2003 +++ clhp/clhp.asd Thu Nov 13 00:10:40 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: clhp.asd,v 1.3 2003/11/13 04:57:44 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: clhp.asd,v 1.4 2003/11/13 05:10:40 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -30,8 +30,8 @@ :name "net.common-lisp.aventimiglia.clhp" :author "Anthony Ventimiglia <anthony(a)ventimiglia.org>" :maintainer "Anthony Ventimiglia <anthony(a)ventimiglia.org>" - :version #.(or "0.2.0alpha" - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 04:57:44 $")) + :version #.(or nil + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 05:10:40 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/Makefile diff -u clhp/Makefile:1.21 clhp/Makefile:1.22 --- clhp/Makefile:1.21 Wed Nov 12 23:57:44 2003 +++ clhp/Makefile Thu Nov 13 00:10:40 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.21 2003/11/13 04:57:44 aventimiglia Exp $ +# $Id: Makefile,v 1.22 2003/11/13 05:10:40 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -84,11 +84,11 @@ # 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/11/13 04:57:44 $ | \ +CVSID=$(shell echo $Date: 2003/11/13 05:10:40 $ | \ awk '{print $$2}'| sed s/\\///g )cvs -#VERSION=$(CVSID) -VERSION=0.2.0alpha +VERSION=$(CVSID) +#VERSION=0.2.0alpha TARROOT=clhp-$(VERSION) TARBALL=$(TARROOT).tar.gz

1 0

[clhp-cvs] CVS update: clhp/clhp.lisp clhp/clhp.asd clhp/TODO clhp/README clhp/NEWS clhp/Makefile clhp/ChangeLog
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv2306 Modified Files: clhp.lisp clhp.asd TODO README NEWS Makefile ChangeLog Log Message: Final commit for 0.2.0alpha release Date: Wed Nov 12 23:57:45 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.18 clhp/clhp.lisp:1.19 --- clhp/clhp.lisp:1.18 Wed Nov 12 17:41:55 2003 +++ clhp/clhp.lisp Wed Nov 12 23:57:44 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.18 2003/11/12 22:41:55 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.19 2003/11/13 04:57:44 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -28,8 +28,8 @@ ;; by changing the NIL in the first part of the OR, a release number ;; will override the CVS keyword (defconstant *CLHP-VERSION* - #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/12 22:41:55 $")) + #.(or "0.2.0alpha" ; Set this for releases + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 04:57:44 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/clhp.asd diff -u clhp/clhp.asd:1.2 clhp/clhp.asd:1.3 --- clhp/clhp.asd:1.2 Fri Oct 17 09:11:44 2003 +++ clhp/clhp.asd Wed Nov 12 23:57:44 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: clhp.asd,v 1.2 2003/10/17 13:11:44 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: clhp.asd,v 1.3 2003/11/13 04:57:44 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -30,8 +30,15 @@ :name "net.common-lisp.aventimiglia.clhp" :author "Anthony Ventimiglia <anthony(a)ventimiglia.org>" :maintainer "Anthony Ventimiglia <anthony(a)ventimiglia.org>" - :version "x.x.x" - :description "" + :version #.(or "0.2.0alpha" + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 04:57:44 $")) + (date (subseq trimmed 0 (search " " trimmed)))) + (concatenate 'string + (subseq date 0 4) + (subseq date 5 7) + (subseq date 8 10) + "cvs"))) + :description "CLHP the Common Lisp Hypertext Preprocesor" :long-description "" :licence "GNU Lesser General Public License" :components Index: clhp/TODO diff -u clhp/TODO:1.12 clhp/TODO:1.13 --- clhp/TODO:1.12 Wed Nov 12 23:21:34 2003 +++ clhp/TODO Wed Nov 12 23:57:44 2003 @@ -1,4 +1,9 @@ -$Id: TODO,v 1.12 2003/11/13 04:21:34 aventimiglia Exp $ -*- outline -*- +$Id: TODO,v 1.13 2003/11/13 04:57:44 aventimiglia Exp $ -*- outline -*- + +* Make a new installation method, more lisp based. + part of this should do automatic versioning, or at least make + version set in a single file instead of spread between Makefile, + clhp.asd and clhp.lisp like it is now * Rewrite docs for new mod_clhp handler Index: clhp/README diff -u clhp/README:1.2 clhp/README:1.3 --- clhp/README:1.2 Thu Sep 18 16:57:30 2003 +++ clhp/README Wed Nov 12 23:57:44 2003 @@ -1,4 +1,4 @@ -$Id: README,v 1.2 2003/09/18 20:57:30 aventimiglia Exp $ +$Id: README,v 1.3 2003/11/13 04:57:44 aventimiglia Exp $ CLHP The Common Lisp Hypertext Preprocessor @@ -6,11 +6,6 @@ Lisp. Basically it allows Common Lisp code to be embedded in HTML or XML using XML processing instructions. See INSTALL for installation instructions. See clhp-test.lisp and index.clhp for examples. - -It consists of two pacakges, CL-CGI, which provides a small package to -aide in writing CGI programs in lisp. CLHP is the full package, which -depends on CL-CGI. I decided to keep the two packages separate, -because users may find CL-CGI useful on its own. Please read COPYING for copyright information. Index: clhp/NEWS diff -u clhp/NEWS:1.3 clhp/NEWS:1.4 --- clhp/NEWS:1.3 Wed Oct 15 10:44:04 2003 +++ clhp/NEWS Wed Nov 12 23:57:44 2003 @@ -1,9 +1,17 @@ -$Id: NEWS,v 1.3 2003/10/15 14:44:04 aventimiglia Exp $ -*- outline -*- +$Id: NEWS,v 1.4 2003/11/13 04:57:44 aventimiglia Exp $ -*- outline -*- -* Wed Sep 17 15:17:02 EDT 2003 -- CLHP package migrated from my local - server to common-lisp.net - -* Fri Sep 19 01:56:45 EDT 2003 -- 0.1.0alpha released +* Wed Nov 12 23:52:02 EST 2003 -- 0.2.0alpha release +** mod_clhp + CLHP is now integrated into Apache as a dynamic module. This + simplifies quite a bit from both the users end and the developers + standpoint. +** package is built with ASDF + This also simplifies the build process +** REQUIRE function + used to load external lisp files relative to the Document-root +** *SERVER-ENV* and *QUERY-VARS are now hash-tables. +** CLHP is a single package. + the full package name is :net.common-lisp.aventimiglia.clhp * Wed Oct 15 10:08:33 EDT 2003 -- 0.1.1alpha release See ChangeLog for details, but here's a rundown of the new stuff: @@ -32,4 +40,9 @@ test suite since I didn't really want to deal with learning someone elses. In the future I'm going to write tests for :CLHP - +* Fri Sep 19 01:56:45 EDT 2003 -- 0.1.0alpha released + +* Wed Sep 17 15:17:02 EDT 2003 -- CLHP package migrated from my local + server to common-lisp.net + + Index: clhp/Makefile diff -u clhp/Makefile:1.20 clhp/Makefile:1.21 --- clhp/Makefile:1.20 Wed Nov 12 23:36:14 2003 +++ clhp/Makefile Wed Nov 12 23:57:44 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.20 2003/11/13 04:36:14 aventimiglia Exp $ +# $Id: Makefile,v 1.21 2003/11/13 04:57:44 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -56,16 +56,16 @@ BUILD_CORE=config/build-core.x86f APACHE_MOD=mod_clhp.so -SOURCES=cgi.lisp clhp.lisp package.lisp clhp.asd mod_clhp.c +SOURCES=cgi.lisp clhp.lisp package.lisp clhp.asd mod_clhp.c utility.lisp CORE=clhp.core LISPCBIN=config/lispc.x86f DOCS=COPYING INSTALL ChangeLog NEWS README TODO DIST_SUBDIRS=config examples NON_DIST_SUBDIRS=tests -RECURSIVE_SUBDIRS = examples tests +RECURSIVE_SUBDIRS = tests EXTRADIST=config/build-core.lisp config/lispc.lisp examples/index.clhp \ - Makefile + Makefile config/lisp-init.lisp NON_DIST= tests/Makefile tests/cgi-test.lisp tests/test-suite.lisp @@ -84,11 +84,11 @@ # 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/11/13 04:36:14 $ | \ +CVSID=$(shell echo $Date: 2003/11/13 04:57:44 $ | \ awk '{print $$2}'| sed s/\\///g )cvs -VERSION=$(CVSID) -#VERSION=0.1.2alpha +#VERSION=$(CVSID) +VERSION=0.2.0alpha TARROOT=clhp-$(VERSION) TARBALL=$(TARROOT).tar.gz @@ -135,7 +135,6 @@ install-dirs: $(INSTALLDIR) $(COREDIR) -# $(INSTALLDIR) $(BINDIR) $(INSTALLDIR) $(DOCDIR) install-source-dirs: @@ -187,7 +186,6 @@ 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 {} \; clean-backups: Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.26 clhp/ChangeLog:1.27 --- clhp/ChangeLog:1.26 Wed Nov 12 23:36:14 2003 +++ clhp/ChangeLog Wed Nov 12 23:57:44 2003 @@ -88,10 +88,6 @@ CA-LIST-TO-A-LIST, MAKE-KEYWORD, and LIST-TO-A-LIST out of cgi.lisp in here. - * 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-17 08:58 <aventimiglia(a)common-lisp.net> * config/build-core.lisp, ChangeLog, Makefile, TODO, cgi.lisp, @@ -293,9 +289,9 @@ 2003-09-17 16:21 <aventimiglia(a)common-lisp.net> * clhp.lisp: Wrote a nice little reader macro to make cvs - versioning automatic, the $Date: 2003/11/13 04:36:14 $ keyword is parsed to make a 8 + versioning automatic, the $Date: 2003/11/13 04:57:44 $ keyword is parsed to make a 8 digit number YYYYMMDD with the suffix "cvs" addedd, so a CVS - release with a $Date: 2003/11/13 04:36:14 $ of 2003/09/15 ends up with a + release with a $Date: 2003/11/13 04:57:44 $ of 2003/09/15 ends up with a *CLHP-VERSION* of "20030915cvs" 2003-09-17 14:47 <aventimiglia(a)common-lisp.net> @@ -304,4 +300,4 @@ that will aide in compiling lisp in a mkae freindly way by passing a non-zero exit code when compilation fails -$Id: ChangeLog,v 1.26 2003/11/13 04:36:14 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.27 2003/11/13 04:57:44 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: clhp/config/runclcgi.src clhp/config/binfmt-test.lisp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv25184/config Removed Files: runclcgi.src binfmt-test.lisp Log Message: Preparing for distribution, I've removed all files and stuff needed for the old cgi based clhp, mod_clhp makes it all simpler Date: Wed Nov 12 23:36:14 2003 Author: aventimiglia

1 0

[clhp-cvs] CVS update: clhp/examples/test.lisp clhp/examples/clhp-test.lisp clhp/examples/Makefile
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp/examples In directory common-lisp.net:/tmp/cvs-serv25184/examples Removed Files: test.lisp clhp-test.lisp Makefile Log Message: Preparing for distribution, I've removed all files and stuff needed for the old cgi based clhp, mod_clhp makes it all simpler Date: Wed Nov 12 23:36:13 2003 Author: aventimiglia

1 0

[clhp-cvs] CVS update: clhp/Makefile clhp/ChangeLog clhp/start-clcgi.lisp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv25184 Modified Files: Makefile ChangeLog Removed Files: start-clcgi.lisp Log Message: Preparing for distribution, I've removed all files and stuff needed for the old cgi based clhp, mod_clhp makes it all simpler Date: Wed Nov 12 23:36:14 2003 Author: aventimiglia Index: clhp/Makefile diff -u clhp/Makefile:1.19 clhp/Makefile:1.20 --- clhp/Makefile:1.19 Wed Nov 12 22:57:03 2003 +++ clhp/Makefile Wed Nov 12 23:36:14 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.19 2003/11/13 03:57:03 aventimiglia Exp $ +# $Id: Makefile,v 1.20 2003/11/13 04:36:14 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -23,15 +23,9 @@ # This is where lisp sources will be installed SRCDIR=/usr/lib/cmucl/source/clhp -# Directory where cmucl looks for libraries $CMUCLLIB -# LIBDIR=/usr/lib/cmucl/lib - # Directory to install the clhp lisp core COREDIR=/usr/lib/cmucl -# Directory to add runclcgi script -# BINDIR=/usr/local/bin - # Directory to install documentation DOCDIR=/usr/local/share/clhp @@ -61,26 +55,22 @@ LISPC=$(LISP) -noinit -load config/lispc -eval '(make)' BUILD_CORE=config/build-core.x86f -#BINS=start-clcgi.x86f APACHE_MOD=mod_clhp.so -SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp package.lisp clhp.asd mod_clhp.c +SOURCES=cgi.lisp clhp.lisp package.lisp clhp.asd mod_clhp.c CORE=clhp.core LISPCBIN=config/lispc.x86f -#RUNCGI=config/runclcgi -TESTS=config/binfmt-test.clcgi DOCS=COPYING INSTALL ChangeLog NEWS README TODO DIST_SUBDIRS=config examples NON_DIST_SUBDIRS=tests RECURSIVE_SUBDIRS = examples tests -EXTRADIST=config/binfmt-test.lisp config/build-core.lisp config/lispc.lisp \ - config/runclcgi.src examples/Makefile examples/clhp-test.lisp \ - examples/index.clhp examples/test.lisp Makefile +EXTRADIST=config/build-core.lisp config/lispc.lisp examples/index.clhp \ + Makefile NON_DIST= tests/Makefile tests/cgi-test.lisp tests/test-suite.lisp -CLEAN_TARGETS=$(LISPCBIN) $(CORE) $(CORE).BAK $(TESTS) $(TARBALL) \ - $(APACHE_MOD) mod_clhp.o # $(RUNCGI) +CLEAN_TARGETS=$(LISPCBIN) $(CORE) $(CORE).BAK $(TARBALL) \ + $(APACHE_MOD) mod_clhp.o DISTFILES=$(SOURCES) $(DOCS) $(EXTRADIST) @@ -94,7 +84,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/11/13 03:57:03 $ | \ +CVSID=$(shell echo $Date: 2003/11/13 04:36:14 $ | \ awk '{print $$2}'| sed s/\\///g )cvs VERSION=$(CVSID) @@ -104,7 +94,7 @@ RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive -all: $(LISPCBIN) $(CORE) # $(RUNCGI) $(BINS) +all: $(LISPCBIN) $(CORE) module:$(APACHE_MOD) @@ -113,7 +103,7 @@ .PHONY: all install uninstall clean clean-all clean-backups install-dirs \ install-source install-source-dirs uninstall-files uninstall-dirs \ - install-core tests clean-dist $(RECURSIVE_TARGETS) check \ + install-core clean-dist $(RECURSIVE_TARGETS) check \ module-install %.x86f: %.lisp @@ -122,11 +112,6 @@ %.clcgi: %.x86f mv -v $< $@ -tests: $(TESTS) - for file in $(TESTS); do \ - if test ! -x $$file; then $(CHMOD) -v a+x $$file ; fi \ - done - check: $(CORE) check-recursive $(LISPCBIN): config/lispc.lisp @@ -134,20 +119,11 @@ $(CORE): $(SOURCES) $(BUILD_CORE) $(LISP) -noinit -load "config/build-core" -# $(RUNCGI): $(RUNCGI).src -# sed 's:$LISP=$:\1$(LISP):' < $< | \ -# sed 's:$CORE=$:\1$(COREDIR)/$(CORE):' | \ -# sed 's:$CMUCLLIB=$:\1$(LIBDIR):' > $@ - module-install: $(APACHE_MOD) $(APXS) -i -a $< install: all install-dirs install-core -# for f in $(BINS) ; do \ -# $(INSTALLFILE) $$f $(LIBDIR) ; \ -# done $(INSTALL) $(DOCS) $(DOCDIR) -# $(INSTALL) -m0755 $(RUNCGI) $(BINDIR) install-core: $(CORE) install-dirs $(INSTALLFILE) -b -S .BAK $(CORE) $(COREDIR) @@ -158,7 +134,6 @@ done install-dirs: -# $(INSTALLDIR) $(LIBDIR) $(INSTALLDIR) $(COREDIR) # $(INSTALLDIR) $(BINDIR) $(INSTALLDIR) $(DOCDIR) @@ -172,9 +147,6 @@ for f in $(SOURCES) ; do \ if test -f $(SRCDIR)/$$f; then rm -v $(SRCDIR)/$$f ; fi ; \ done -# for f in $(LIBS) ; do \ -# if test -f $(LIBDIR)/$$f; then rm -v $(LIBDIR)/$$f ; fi ; \ -# done for f in $(DOCS) ; do \ fullpath=$(DOCDIR)/$$f ; \ if test -f $$fullpath; then rm -v $$fullpath ; fi ; \ @@ -182,12 +154,9 @@ core=$(COREDIR)/$(CORE) ; \ if test -f $$core ; then rm -v $$core; fi ; \ if test -f $$core.BAK; then mv -v $$core.BAK $$core; fi -# file=$(BINDIR)/`echo $(RUNCGI) | sed 's/config\///'` ; \ -# if test -f $$file ; then rm -v $$file; fi uninstall-dirs: uninstall-files -rmdir -v $(SRCDIR) -# -rmdir -v $(LIBDIR) -rmdir -v $(COREDIR) -rmdir -v $(BINDIR) -rmdir -v $(DOCDIR) Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.25 clhp/ChangeLog:1.26 --- clhp/ChangeLog:1.25 Wed Nov 12 23:21:34 2003 +++ clhp/ChangeLog Wed Nov 12 23:36:14 2003 @@ -1,5 +1,7 @@ 2003-11-12 Anthony Ventimiglia <ant(a)afghan.dogpound> + * Makefile: Removed pretty much all traces of old cgi based clhp + * INSTALL: Commented out LIBDIR since it does not need to be used for new installation, rewrote for new installation @@ -291,9 +293,9 @@ 2003-09-17 16:21 <aventimiglia(a)common-lisp.net> * clhp.lisp: Wrote a nice little reader macro to make cvs - versioning automatic, the $Date: 2003/11/13 04:21:34 $ keyword is parsed to make a 8 + versioning automatic, the $Date: 2003/11/13 04:36:14 $ keyword is parsed to make a 8 digit number YYYYMMDD with the suffix "cvs" addedd, so a CVS - release with a $Date: 2003/11/13 04:21:34 $ of 2003/09/15 ends up with a + release with a $Date: 2003/11/13 04:36:14 $ of 2003/09/15 ends up with a *CLHP-VERSION* of "20030915cvs" 2003-09-17 14:47 <aventimiglia(a)common-lisp.net> @@ -302,4 +304,4 @@ that will aide in compiling lisp in a mkae freindly way by passing a non-zero exit code when compilation fails -$Id: ChangeLog,v 1.25 2003/11/13 04:21:34 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.26 2003/11/13 04:36:14 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: clhp/ChangeLog clhp/INSTALL clhp/TODO
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv18166 Modified Files: ChangeLog INSTALL TODO Log Message: Updateed and tested the INSTALL installation Date: Wed Nov 12 23:21:34 2003 Author: aventimiglia Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.24 clhp/ChangeLog:1.25 --- clhp/ChangeLog:1.24 Wed Nov 12 22:17:29 2003 +++ clhp/ChangeLog Wed Nov 12 23:21:34 2003 @@ -1,5 +1,8 @@ 2003-11-12 Anthony Ventimiglia <ant(a)afghan.dogpound> + * INSTALL: Commented out LIBDIR since it does not need to be used + for new installation, rewrote for new installation + * Makefile: Modifying Makefile to build with new mod_clhp interface, but staying with the Makefile approach. @@ -288,9 +291,9 @@ 2003-09-17 16:21 <aventimiglia(a)common-lisp.net> * clhp.lisp: Wrote a nice little reader macro to make cvs - versioning automatic, the $Date: 2003/11/13 03:17:29 $ keyword is parsed to make a 8 + versioning automatic, the $Date: 2003/11/13 04:21:34 $ keyword is parsed to make a 8 digit number YYYYMMDD with the suffix "cvs" addedd, so a CVS - release with a $Date: 2003/11/13 03:17:29 $ of 2003/09/15 ends up with a + release with a $Date: 2003/11/13 04:21:34 $ of 2003/09/15 ends up with a *CLHP-VERSION* of "20030915cvs" 2003-09-17 14:47 <aventimiglia(a)common-lisp.net> @@ -299,4 +302,4 @@ that will aide in compiling lisp in a mkae freindly way by passing a non-zero exit code when compilation fails -$Id: ChangeLog,v 1.24 2003/11/13 03:17:29 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.25 2003/11/13 04:21:34 aventimiglia Exp $ \ No newline at end of file Index: clhp/INSTALL diff -u clhp/INSTALL:1.4 clhp/INSTALL:1.5 --- clhp/INSTALL:1.4 Wed Nov 12 22:17:29 2003 +++ clhp/INSTALL Wed Nov 12 23:21:34 2003 @@ -1,4 +1,4 @@ -$Id: INSTALL,v 1.4 2003/11/13 03:17:29 aventimiglia Exp $ -*- outline -*- +$Id: INSTALL,v 1.5 2003/11/13 04:21:34 aventimiglia Exp $ -*- outline -*- If you find anything about this documentation unclear, or you would like to contribute to the documentation or the CLHP project, please @@ -19,6 +19,9 @@ You should have dynamic module support, I guess it can be installed without it, but that will require rebuilding the entire server. + + you need the apxs program to build the module, on some + distributions, this will be in the apache-dev package * Installation ** Getting the Latest source *** ftp @@ -37,22 +40,30 @@ list, so you can stay up to date on what's going on with development. ** Edit Makefile variables Open the top level Makefile in a text editor and edit the SRCDIR, - LIBDIR, COREDIR, LISP, and INSTALL variables. For a typical + COREDIR, LISP, APXS and INSTALL variables. For a typical installation of cmucl, these should be correct. +*** COREDIR + If you change the default, you also have to change the LISP_CORE + #define in mod_clhp.c to reflect this. ** Compiling the libraries and building the CLHP core image at the command line run: $ make + $ make module This will compile the CL-CGI and CLHP packages, then build a custom by loading your existing lisp, loading the CLHP and CGI packages and saving the new core as "clhp.core". + ** Installing Be root (or have write permissions to wherever you are installing *** Installing the package fasl files and custom core To install the CL-CGI and CLHP libraries and the clhp core use: # make install + # make module-install + +---------- IGNORE THE FOLLOWING two sections *** Installing the minimum, core-only Since you have a custom core, you really don't need to install the @@ -66,77 +77,7 @@ and compiled packages, use: # make install-source -** Setting up Linux binfmt_misc to run fasl files -*** Kernel requirements - In order to do this, you must have binfmt_misc support compiled - into your kernel, you can edit the CONFIG_BINFMT_MISC line in - your kernel configuration file /usr/src/linux/.config to read - the following: - - CONFIG_BINFMT_MISC=m - - The following instructions assume you have compiled binfmt_misc - as a module. If you compile it directly into the kernel, you can - delete the modprobe commands. -*** Enabling binfmt_misc - If you had to rebuild your kernel, you will obviously have to - reboot before you can contimue. - - To set up Linux to run CMUCL fasl files, execute the following - commands as root: - - # modprobe binfmt_misc - # mount -t binfmt_misc none /proc/sys/fs/binfmt_misc - # echo ":clcgi:E::clcgi::/usr/local/bin/runclcgi:" > \ - /proc/sys/fs/binfmt_misc/register - - This tells the kernel to use the /usr/local/bin/runclcgi shell - script to execute any files with a .clcgi extension. - - Now if you know a little about cmucl, you know that by default - it assigns the .x86f extension to compiled fasl files. I decided - to use the .clcgi extension for compiled files that require the - CL-CGI and CLHP enabled core. So if you already have your kernel - set up to run .x86f files, this new format will not interfere. - - For convenience, the cl-cgi package has an external function - COMPILE-CGI, which will save the binaries with the .clcgi - extension. This save you the trouble of having to rename your - compiled fasl files. - - ! I believe the binfmt_misc interface may be different on - earlier kernels, if you are having trouble, read binfmt_misc.txt - in the Documentation of your kernel sources. -*** Testing binfmt_misc setup. - Ok now you should be ready to see if all this works. I've - included a small program to test if the binfmt_misc support is - working. run: - - $ make tests - - This will compile config/binfmt-test.clcgi, a simple program - that will test your setup. If you've been following up to this - point, and have registered the clcgi file with the binfmt_misc - kernel interface, try it now, you should get the following - results: - - $ config/binfmt-test.clcgi - binfmt_misc is working - $ -*** Enabling binfmt_misc at bootup. - Now it would probably be a good idea to enable the binfmt_misc - support so it configures automatically at boottime. I'm - developing on Gentoo Linux, the way I've enabled it is by adding - the followin lines to /etc/conf.d/local.start: - - /sbin/modprobe binfmt_misc - mount -t binfmt_misc none /proc/sys/fs/binfmt_misc - echo ":clcgi:E::clcgi::/usr/local/bin/runclcgi:" > \ - /proc/sys/fs/binfmt_misc/register - - Other systems may have other ways to do this, if anyone would - like to send specific instructions for other Systems, I'd be - happy to include them here. +---------- END IGNORE ** Configuring Apache To set up Apache, there are really only two things we need to configure, first, we need to make Apache aware that the .clcgi @@ -144,58 +85,20 @@ lists all the AddHandler directives in you Apache configuration file, and add the following line: - AddHandler cgi-script .clcgi + AddHandler clhp-handler .clhp + + If you'd like index.clhp to be + automatically used with an empty URL, add index.clhp to the + DirectoryIndex Directive: - Now decide what directory you would like to enable to execute the - .clcgi and add make sure the "ExecCGI" Option is listed. On my - home computer I have a virtual host setup at http://clhp.dogpound/ - with the following configuration setting up the Virtual host: - - <VirtualHost clhp.dogpound> - ServerName clhp.dogpound - DocumentRoot /home/ant/public_html/clhp - Options +ExecCGI - DirectoryIndex index.clcgi index.html - </VirtualHost> - - While I eventually plan on writing an Apache module for clhp, I'd - also like to learn to exploit mod_rewrite to my advantage. I'd - appreciate any contributions in either of these departments. + DirectoryIndex index.clhp index.html index.htm index.shtml index.cgi + + After all this you'll need to restart apache to update the configuration. + * Testing your installation - Ok the moment of truth is drawing near, I've included some examples - in the examples/ directory (where else) that we'll use to test the - set-up. To build the example programs, you must first have installed - the minimal requirements as per the above instructions. - - Edit examples Makefile, and make sure all the Variables are correct - then from the top level source directory, do the following, using - the path to your clhp directory (in my example its - /home/ant/public_html/clhp) for INSTALL_PATH: - - $ cd examples - $ make - $ INSTALL_PATH=/home/ant/public_html/clhp make install - - Now fire up your browser and point it to the location of these test - files. In my example, the first is test.clcgi, which just tests the - CGI package: - - $ lynx http://clhp.dogpound/test.clcgi - - And the second which is full blown CLHP, clhp-test.clcgi is a ateway - that loads the content of index.clhp as its source. - - $ lynx http://clhp.dogpound/clhp-test.clcgi - - Take a look at index.clhp and clhp-test.lisp and you'll see how clhp works. -* Working with CLHP -** Compiling lisp files. - Ok I mentioned somewhere above that I was going to put a - COMPILE-CGI function. Well that's not done at the time of this - writing, so for now, you'll have to compile and rename the fasl - files. - - -* New installation notes -** Apache configuration - AddHandler clhp-handler .clhp \ No newline at end of file + There's a test file, examples/index.clhp copy it somewhere where + apache can see it, fire up the browser and it you should see a test + page. + + Take a look at index.clhp + Index: clhp/TODO diff -u clhp/TODO:1.11 clhp/TODO:1.12 --- clhp/TODO:1.11 Wed Nov 12 22:17:29 2003 +++ clhp/TODO Wed Nov 12 23:21:34 2003 @@ -1,6 +1,9 @@ -$Id: TODO,v 1.11 2003/11/13 03:17:29 aventimiglia Exp $ -*- outline -*- +$Id: TODO,v 1.12 2003/11/13 04:21:34 aventimiglia Exp $ -*- outline -*- * Rewrite docs for new mod_clhp handler + +* mod_clhp should check if the requested doc is actually there + Right now Lisp does it. * Test suite ** Convert all this to new deal with single package.

1 0

[clhp-cvs] CVS update: clhp/Makefile
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv7141 Modified Files: Makefile Log Message: Commenting out more for new installation Date: Wed Nov 12 22:57:04 2003 Author: aventimiglia Index: clhp/Makefile diff -u clhp/Makefile:1.18 clhp/Makefile:1.19 --- clhp/Makefile:1.18 Wed Nov 12 22:40:15 2003 +++ clhp/Makefile Wed Nov 12 22:57:03 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.18 2003/11/13 03:40:15 aventimiglia Exp $ +# $Id: Makefile,v 1.19 2003/11/13 03:57:03 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -94,7 +94,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/11/13 03:40:15 $ | \ +CVSID=$(shell echo $Date: 2003/11/13 03:57:03 $ | \ awk '{print $$2}'| sed s/\\///g )cvs VERSION=$(CVSID) @@ -160,7 +160,7 @@ install-dirs: # $(INSTALLDIR) $(LIBDIR) $(INSTALLDIR) $(COREDIR) - $(INSTALLDIR) $(BINDIR) +# $(INSTALLDIR) $(BINDIR) $(INSTALLDIR) $(DOCDIR) install-source-dirs:

1 0

[clhp-cvs] CVS update: clhp/config/lisp-init.lisp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv3354/config Modified Files: lisp-init.lisp Log Message: fixed commented out load command for debian Date: Wed Nov 12 22:49:28 2003 Author: aventimiglia Index: clhp/config/lisp-init.lisp diff -u clhp/config/lisp-init.lisp:1.2 clhp/config/lisp-init.lisp:1.3 --- clhp/config/lisp-init.lisp:1.2 Mon Nov 10 10:33:29 2003 +++ clhp/config/lisp-init.lisp Wed Nov 12 22:49:27 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: lisp-init.lisp,v 1.2 2003/11/10 15:33:29 aventimiglia Exp $") + "$Id: lisp-init.lisp,v 1.3 2003/11/13 03:49:27 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -24,5 +24,4 @@ ;; Any code required at startup time for cmucl should be added here. ;; For example, On a Debian system you may need this to load ASDF -;(eval-when (:load-toplevel :compile-toplevel) -; (load "/usr/share/common-lisp/source/asdf/asdf.lisp")) +;(load "/usr/share/common-lisp/source/asdf/asdf.lisp")

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

clhp-cvs