1.2.29

ChangeLog

@@ -1,3 +1,13 @@
+2003-09-10  Kevin Layer  <layer@crikey>
+1.2.29
+
+	* load.cl,
+	* examples/examples.cl,
+	* examples/urian.cl: use *load-pathname* instead of
+	  *load-truename* since truename in ACL 7.0 goes through symbolic
+	  links and this doesn't work in the way aserve is built at franz
+	  (via symlinks to source code)
+
 2003-09-04  John Foderaro  <jkf@tiger.franz.com>
 1.2.28
 	* non-standard http headers are again supported in all

examples/examples.cl

@@ -22,7 +22,7 @@
 ;; Suite 330, Boston, MA  02111-1307  USA
 ;;
 ;;
-;; $Id: examples.cl,v 1.35 2003/05/09 17:34:01 jkf Exp $
+;; $Id: examples.cl,v 1.36 2003/09/10 16:54:14 layer Exp $
 
 ;; Description:
 ;;   Allegro iServe examples
@@ -43,7 +43,7 @@
 ;; example files this is bad news.
 ; (unpublish :all t)
 
-(defparameter *example-pathname* *load-truename*) ; where this file is
+(defparameter *example-pathname* *load-pathname*) ; where this file is
 (defmacro example-file (name)
     ;; create an absolute address for this file we'll load
     `(merge-pathnames ,name *example-pathname*))

examples/urian.cl

@@ -22,7 +22,7 @@
 ;; Suite 330, Boston, MA  02111-1307  USA
 ;;
 ;;
-;; $Id: urian.cl,v 1.4 2003/02/26 01:16:47 jkf Exp $
+;; $Id: urian.cl,v 1.5 2003/09/10 16:54:14 layer Exp $
 
 ;; Description:
 ;;   urian example
@@ -59,15 +59,15 @@
       (declare (ignore c))
       (let (name)
 	(if* (or (probe-file (setq name (concatenate 'string
-					  (directory-namestring *load-truename*)
+					  (directory-namestring *load-pathname*)
 					  "../xmlutils/phtml.fasl")))
 		 (probe-file (setq name (concatenate 'string
-					  (directory-namestring *load-truename*)
+					  (directory-namestring *load-pathname*)
 					  "../../xmlutils/phtml.fasl"))))
 
 	   then (load name)
 	   else (format t " not at ~s~%, tn is ~s~%" name
-			*load-truename*)
+			*load-pathname*)
 		(error "can't locate phtml module"))))))
 
 (defpackage :urian

load.cl

@@ -1,10 +1,10 @@
 ;; load in aserve
 ;;
-;; $Id: load.cl,v 1.60 2003/07/07 21:10:13 jkf Exp $
+;; $Id: load.cl,v 1.61 2003/09/10 16:54:14 layer Exp $
 ;;
 
 (defvar *loadswitch* :compile-if-needed)
-(defparameter *aserve-root* (directory-namestring *load-truename*))
+(defparameter *aserve-root* (directory-namestring *load-pathname*))
 
 (defparameter *aserve-files* 
     ;; this list is in cl/src/sys/make.cl as well... keep in sync
@@ -95,9 +95,9 @@
       ;; not the lite version
       (if* (equal file "examples/examples")
 	 then (load (merge-pathnames (format nil "~a.cl" file)
-				     *load-truename*))
+				     *load-pathname*))
 	 else (excl:load-compiled (merge-pathnames (format nil "~a.cl" file)
-						   *load-truename*)))
+						   *load-pathname*)))
       (gc t) ; must compact to keep under the heap limit
       )
     #-allegro-cl-lite
@@ -106,14 +106,14 @@
        then (progn (case *loadswitch*
 		     (:compile-if-needed (compile-file-if-needed 
 					  (merge-pathnames (format nil "~a.cl" file)
-							   *load-truename*)))
+							   *load-pathname*)))
 		     (:compile (compile-file 
 				(merge-pathnames (format nil "~a.cl" file)
-						 *load-truename*)))
+						 *load-pathname*)))
 		     (:load nil))
 		   (load (merge-pathnames 
 			  (format nil "~a.fasl" file)
-			  *load-truename*))))))
+			  *load-pathname*))))))
 
 
 

main.cl

@@ -23,7 +23,7 @@
 ;; Suite 330, Boston, MA  02111-1307  USA
 ;;
 ;;
-;; $Id: main.cl,v 1.148 2003/09/04 21:36:33 jkf Exp $
+;; $Id: main.cl,v 1.149 2003/09/10 16:54:14 layer Exp $
 
 ;; Description:
 ;;   aserve's main loop
@@ -37,7 +37,7 @@
 
 (in-package :net.aserve)
 
-(defparameter *aserve-version* '(1 2 28))
+(defparameter *aserve-version* '(1 2 29))
 
 (eval-when (eval load)
     (require :sock)

test/t-aserve.cl

@@ -22,7 +22,7 @@
 ;; Suite 330, Boston, MA  02111-1307  USA
 ;;
 ;;
-;; $Id: t-aserve.cl,v 1.48 2003/09/04 21:36:33 jkf Exp $
+;; $Id: t-aserve.cl,v 1.49 2003/09/10 16:54:14 layer Exp $
 
 ;; Description:
 ;;   test iserve
@@ -56,7 +56,7 @@
 (defvar *save-proxy-wserver* nil)
 
 ; remember where we were loaded from so we can run manually
-(defparameter *aserve-load-truename* *load-truename*)
+(defparameter *aserve-load-truename* *load-pathname*)
 
 (defun test-aserve (test-timeouts)
   ;; run the allegroserve tests three ways: