Changeset 12676

Timestamp:

05/13/10 16:44:05 (13 years ago)

Author:

Mark Evenson

Message:

Muffle warning from Ant 1.8.1 about includeantruntime not being set.

Location:

trunk/abcl

Files:

• abcl.in (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/armedbear/lisp/require.lisp (modified) (2 diffs)

trunk/abcl/abcl.in

@@ -20 +20 @@
 # 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 \
   "$@"

trunk/abcl/build.xml

@@ -177 +177 @@
        debug="true"
        target="1.5"
+             includeantruntime="false"
        failonerror="true">
   <src path="${src.dir}"/>

trunk/abcl/src/org/armedbear/lisp/require.lisp

@@ -39 +39 @@
 (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)
@@ -62 +78 @@
                            (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))))