Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv23663 Modified Files: TODO Makefile INSTALL ChangeLog Added Files: build.lisp Log Message: Working on the installation process using mod_clhp, I'm going to get this working, and make a 0.2.0 release, then I'll work on a whole new building approach. Date: Wed Nov 12 22:17:29 2003 Author: aventimiglia Index: clhp/TODO diff -u clhp/TODO:1.10 clhp/TODO:1.11 --- clhp/TODO:1.10 Wed Nov 12 16:57:11 2003 +++ clhp/TODO Wed Nov 12 22:17:29 2003 @@ -1,4 +1,4 @@ -$Id: TODO,v 1.10 2003/11/12 21:57:11 aventimiglia Exp $ -*- outline -*- +$Id: TODO,v 1.11 2003/11/13 03:17:29 aventimiglia Exp $ -*- outline -*- * Rewrite docs for new mod_clhp handler @@ -14,13 +14,6 @@ * Declare Declaim and Proclaim GO through everything and refine and type it all. -* COMPILE-CGI - This is just a convenience function that will compile and save fasl - files with the .clcgi extension. - - Maybe I could also write a compiler program and install it in - /usr/local/bin (or wherever), to drop into makefiles. - * Command-line CLHP Write a small program to enable CLHP to be parse at the command line, separate from the server. This mode should supress printing of @@ -52,11 +45,11 @@ * Pre-release check list ** version numbering - VERSION in Makefile and *CLHP-VERSION* in clhp.lisp should be - set. Eventually I'd like to set up a nice way to have this all - happen automatically. I think the best way to do this is to make - the whole build process more lisp dependent. The other option is - to go automake with it. + VERSION in Makefile, :version in clhp.asd and *CLHP-VERSION* in + clhp.lisp should be set. Eventually I'd like to set up a nice way + to have this all happen automatically. I think the best way to do + this is to make the whole build process more lisp dependent. The + other option is to go automake with it. The way it works now is very nice, in fact, I don't think Automake could do it so well. Index: clhp/Makefile diff -u clhp/Makefile:1.16 clhp/Makefile:1.17 --- clhp/Makefile:1.16 Thu Oct 30 21:27:11 2003 +++ clhp/Makefile Wed Nov 12 22:17:29 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.16 2003/10/31 02:27:11 aventimiglia Exp $ +# $Id: Makefile,v 1.17 2003/11/13 03:17:29 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -30,7 +30,7 @@ COREDIR=/usr/lib/cmucl # Directory to add runclcgi script -BINDIR=/usr/local/bin +# BINDIR=/usr/local/bin # Directory to install documentation DOCDIR=/usr/local/share/clhp @@ -61,12 +61,12 @@ LISPC=$(LISP) -noinit -load config/lispc -eval '(make)' BUILD_CORE=config/build-core.x86f -BINS=start-clcgi.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 CORE=clhp.core LISPCBIN=config/lispc.x86f -RUNCGI=config/runclcgi +#RUNCGI=config/runclcgi TESTS=config/binfmt-test.clcgi DOCS=COPYING INSTALL ChangeLog NEWS README TODO @@ -79,8 +79,8 @@ NON_DIST= tests/Makefile tests/cgi-test.lisp tests/test-suite.lisp -CLEAN_TARGETS=$(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) $(TESTS) $(TARBALL) \ - $(APACHE_MOD) mod_clhp.o +CLEAN_TARGETS=$(LISPCBIN) $(CORE) $(CORE).BAK $(TESTS) $(TARBALL) \ + $(APACHE_MOD) mod_clhp.o # $(RUNCGI) DISTFILES=$(SOURCES) $(DOCS) $(EXTRADIST) @@ -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/10/31 02:27:11 $ | \ +CVSID=$(shell echo $Date: 2003/11/13 03:17:29 $ | \ awk '{print $$2}'| sed s/\\///g )cvs VERSION=$(CVSID) @@ -104,7 +104,7 @@ RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive -all: $(LISPCBIN) $(CORE) $(RUNCGI) $(BINS) +all: $(LISPCBIN) $(CORE) # $(RUNCGI) $(BINS) module:$(APACHE_MOD) @@ -134,20 +134,20 @@ $(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):' > $@ +# $(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 +# for f in $(BINS) ; do \ +# $(INSTALLFILE) $$f $(LIBDIR) ; \ +# done $(INSTALL) $(DOCS) $(DOCDIR) - $(INSTALL) -m0755 $(RUNCGI) $(BINDIR) +# $(INSTALL) -m0755 $(RUNCGI) $(BINDIR) install-core: $(CORE) install-dirs $(INSTALLFILE) -b -S .BAK $(CORE) $(COREDIR) @@ -182,8 +182,8 @@ 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 +# file=$(BINDIR)/`echo $(RUNCGI) | sed 's/config\///'` ; \ +# if test -f $$file ; then rm -v $$file; fi uninstall-dirs: uninstall-files -rmdir -v $(SRCDIR) Index: clhp/INSTALL diff -u clhp/INSTALL:1.3 clhp/INSTALL:1.4 --- clhp/INSTALL:1.3 Wed Nov 12 16:57:12 2003 +++ clhp/INSTALL Wed Nov 12 22:17:29 2003 @@ -1,17 +1,24 @@ -$Id: INSTALL,v 1.3 2003/11/12 21:57:12 aventimiglia Exp $ -*- outline -*- +$Id: INSTALL,v 1.4 2003/11/13 03:17:29 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 send email to clhp-devel@common-lisp.net * Requirements -** Linux -*** binfmt_misc kernel support - This is not a requirement, but it is preferred for these - installation instructions +** Operating System + This was developed on Linux, but it should work on any OS that + supports Apache and CMUCL ** CMU Common Lisp (cmucl) + Developed on CMUCL release 18e. There is not much CMUCL dependant + stuff so porting to another Lisp should be a fairly easy task. +*** ASDF + the build process uses ASDF, it can be built without, but you're + on your own with that. ** Apache Web Server -*** mod_cgi + Developed on 1.3.27. + + You should have dynamic module support, I guess it can be + installed without it, but that will require rebuilding the entire server. * Installation ** Getting the Latest source *** ftp @@ -25,6 +32,9 @@ $ cvs -d:pserver:anonymous@common-lisp.net:/project/clhp/cvsroot login >> enter anonymous as password $ cvs -d:pserver:anonymous@common-lisp.net:/project/clhp/cvsroot co clhp + + If you use the cvs source, please join the clhp-devel mailing + 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 Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.23 clhp/ChangeLog:1.24 --- clhp/ChangeLog:1.23 Wed Nov 12 17:41:56 2003 +++ clhp/ChangeLog Wed Nov 12 22:17:29 2003 @@ -1,5 +1,8 @@ 2003-11-12 Anthony Ventimiglia <ant@afghan.dogpound> + * Makefile: Modifying Makefile to build with new mod_clhp + interface, but staying with the Makefile approach. + * clhp.lisp (require): REQUIRE function, loads lisp files in the current clhp document-root @@ -285,9 +288,9 @@ 2003-09-17 16:21 <aventimiglia@common-lisp.net> * clhp.lisp: Wrote a nice little reader macro to make cvs - versioning automatic, the $Date: 2003/11/12 22:41:56 $ keyword is parsed to make a 8 + versioning automatic, the $Date: 2003/11/13 03:17:29 $ keyword is parsed to make a 8 digit number YYYYMMDD with the suffix "cvs" addedd, so a CVS - release with a $Date: 2003/11/12 22:41:56 $ of 2003/09/15 ends up with a + release with a $Date: 2003/11/13 03:17:29 $ of 2003/09/15 ends up with a *CLHP-VERSION* of "20030915cvs" 2003-09-17 14:47 <aventimiglia@common-lisp.net> @@ -296,4 +299,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.23 2003/11/12 22:41:56 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.24 2003/11/13 03:17:29 aventimiglia Exp $ \ No newline at end of file