[armedbear-cvs] r12676 - in trunk/abcl: . src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Thu May 13 12:44:05 2010
New Revision: 12676

Log:
Muffle warning from Ant 1.8.1 about includeantruntime not being set.



Modified:
   trunk/abcl/abcl.in
   trunk/abcl/build.xml
   trunk/abcl/src/org/armedbear/lisp/require.lisp

Modified: trunk/abcl/abcl.in
==============================================================================
--- trunk/abcl/abcl.in	(original)
+++ trunk/abcl/abcl.in	Thu May 13 12:44:05 2010
@@ -19,8 +19,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-exec @JAVA@ @ABCL_JAVA_OPTIONS@ \
-  -cp  @ABCL_CLASSPATH@ \
+if [ -z ${CLASSPATH} ]; then
+    CLASSPATH=@ABCL_CLASSPATH@
+else 
+    CLASSPATH=@ABCL_CLASSPATH@:${CLASSPATH}
+fi
+
+CLASSPATH=$CLASSPATH exec @JAVA@ @ABCL_JAVA_OPTIONS@ \
   org.armedbear.lisp.Main \
   "$@"
 

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	(original)
+++ trunk/abcl/build.xml	Thu May 13 12:44:05 2010
@@ -176,6 +176,7 @@
       <javac destdir="${build.classes.dir}"
 	     debug="true"
 	     target="1.5"
+             includeantruntime="false"
 	     failonerror="true">
 	<src path="${src.dir}"/>
 	<patternset refid="abcl.source.java"/>

Modified: trunk/abcl/src/org/armedbear/lisp/require.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/require.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/require.lisp	Thu May 13 12:44:05 2010
@@ -38,15 +38,31 @@
 
 (defun module-provide-system (module) 
   (let ((*readtable* (copy-readtable nil)))
-    (handler-case 
-        (load-system-file (string-downcase (string module)))
-      (t (e) 
-        (unless (and (typep e 'error)
-                     (search "Failed to find loadable system file"
-                             (format nil "~A" e)))
-          (format *error-output* "Failed to require  ~A because '~A'~%" 
-                  module e))
-        nil))))
+       (handler-case 
+           (load-system-file (string-downcase (string module)))
+         (t (e) 
+           (unless (and (typep e 'error)
+                        (search "Failed to find loadable system file"
+                                (format nil "~A" e)))
+             (format *error-output* "Failed to require  ~A because '~A'~%" 
+                     module e))
+           nil))))
+
+         ;;   (progn 
+         ;;     (format t "BEFORE~%")
+         ;;     (load-system-file (string-downcase (string module)))
+         ;;     (format t "AFTER~%"))
+         ;; ((error (c) 
+         ;;   (progn 
+         ;;     (format t "MATCHED~%")
+         ;;     ;; XXX It would be much better to detect an error
+         ;;     ;; type rather than searching for a string, but
+
+         ;;     ;; that's tricky as LOAD-SYSTEM-FILE is such an
+         ;;     ;; early primitive.
+         ;;     (when (search "Failed to find loadable system file"
+         ;;                   (format nil "~A" c))
+         ;;       (return-from module-provide-system (values nil c)))))))))
     
 (defvar *module-provider-functions* nil)
 
@@ -61,6 +77,6 @@
              (unless (some (lambda (p) (funcall p module-name))
                            (append (list #'module-provide-system)
                                  sys::*module-provider-functions*))
-               (error "Don't know how to ~S ~A." 'require module-name))))
+               (warn "Failed to require ~A." module-name))))
       (set-difference *modules* saved-modules))))