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

[Mark Evenson]

Author: mevenson
Date: Thu May 13 12:47:44 2010
New Revision: 12677

Log:
Correct incorrect inclusion of changes in last commit.


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

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:47:44 2010
@@ -38,31 +38,15 @@
 
 (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))))
-
-         ;;   (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)))))))))
+    (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))))
     
 (defvar *module-provider-functions* nil)
 
@@ -77,6 +61,6 @@
              (unless (some (lambda (p) (funcall p module-name))
                            (append (list #'module-provide-system)
                                  sys::*module-provider-functions*))
-               (warn "Failed to require ~A." module-name))))
+               (error "Don't know how to ~S ~A." 'require module-name))))
       (set-difference *modules* saved-modules))))