Changeset 15398

Timestamp:

10/10/20 21:43:33 (2 years ago)

Author:

Mark Evenson

Message:

Fixes for working under Windows 10

Remove intermediate compiler artifacts from the ZipCache?.

Fix URI for previous release.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Pathname.java (modified) (1 diff)
• PathnameJar.java (modified) (1 diff)
• ZipCache.java (modified) (1 diff)
• abcl-contrib.lisp (modified) (1 diff)
• compile-file.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -1755 +1755 @@
       }
 
-      if (pathname.getDevice() != NIL) { 
-        result.setDevice(p.getDevice());
+      if (pathname.getDevice() != NIL) {
+        if (!Utilities.isPlatformWindows) {
+          result.setDevice(p.getDevice());
+        } else {
+          if (d instanceof PathnameJar
+        && p instanceof PathnameJar) {
+            result.setDevice(d.getDevice());
+          } else { 
+            result.setDevice(p.getDevice());
+          }
+        }
       } else {
         // If the defaults contain a JAR-PATHNAME, and the pathname

trunk/abcl/src/org/armedbear/lisp/PathnameJar.java

@@ -588 +588 @@
       }
     }
-    return -1; // shouldn't be reached
+    return 0;
   }
 }

trunk/abcl/src/org/armedbear/lisp/ZipCache.java

@@ -606 +606 @@
     public LispObject execute(LispObject arg) {
       Pathname p = coerceToPathname(arg);
-      if (!(p instanceof PathnameJar)) {
-        type_error(arg, Symbol.JAR_PATHNAME);
-      }
-      boolean result = ZipCache.remove((PathnameJar)p);
+      boolean result = false;
+      if (p instanceof PathnameJar) {
+        result = ZipCache.remove((PathnameJar)p);
+      } 
       return result ? T : NIL;
     }

trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp

@@ -57 +57 @@
    ;; it would minimally need to check version information.
    (ignore-errors
-     #p"jar:file:https://abcl.org/releases/1.7.1/abcl.jar!/")))
+     #p"jar:https://abcl.org/releases/1.7.1/abcl.jar!/")))
 
 (defun flatten (list)

trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

@@ -972 +972 @@
         do (write-line line out)))))
         (delete-file temp-file)
-        (when (find :windows *features*)
+        (when (subtypep (type-of output-file) 'jar-pathname)
           (remove-zip-cache-entry output-file))
         (rename-file temp-file2 output-file)