Changeset 15398


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Pathname.java

    r15396 r15398  
    17551755      }
    17561756
    1757       if (pathname.getDevice() != NIL) {
    1758         result.setDevice(p.getDevice());
     1757      if (pathname.getDevice() != NIL) {
     1758        if (!Utilities.isPlatformWindows) {
     1759          result.setDevice(p.getDevice());
     1760        } else {
     1761          if (d instanceof PathnameJar
     1762        && p instanceof PathnameJar) {
     1763            result.setDevice(d.getDevice());
     1764          } else {
     1765            result.setDevice(p.getDevice());
     1766          }
     1767        }
    17591768      } else {
    17601769        // If the defaults contain a JAR-PATHNAME, and the pathname
  • trunk/abcl/src/org/armedbear/lisp/PathnameJar.java

    r15397 r15398  
    588588      }
    589589    }
    590     return -1; // shouldn't be reached
     590    return 0;
    591591  }
    592592}
  • trunk/abcl/src/org/armedbear/lisp/ZipCache.java

    r15397 r15398  
    606606    public LispObject execute(LispObject arg) {
    607607      Pathname p = coerceToPathname(arg);
    608       if (!(p instanceof PathnameJar)) {
    609         type_error(arg, Symbol.JAR_PATHNAME);
    610       }
    611       boolean result = ZipCache.remove((PathnameJar)p);
     608      boolean result = false;
     609      if (p instanceof PathnameJar) {
     610        result = ZipCache.remove((PathnameJar)p);
     611      }
    612612      return result ? T : NIL;
    613613    }
  • trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp

    r15396 r15398  
    5757   ;; it would minimally need to check version information.
    5858   (ignore-errors
    59      #p"jar:file:https://abcl.org/releases/1.7.1/abcl.jar!/")))
     59     #p"jar:https://abcl.org/releases/1.7.1/abcl.jar!/")))
    6060
    6161(defun flatten (list)
  • trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

    r15366 r15398  
    972972        do (write-line line out)))))
    973973        (delete-file temp-file)
    974         (when (find :windows *features*)
     974        (when (subtypep (type-of output-file) 'jar-pathname)
    975975          (remove-zip-cache-entry output-file))
    976976        (rename-file temp-file2 output-file)
Note: See TracChangeset for help on using the changeset viewer.