Changeset 13149


Ignore:
Timestamp:
01/14/11 21:12:30 (11 years ago)
Author:
astalla
Message:

Keep sys::make-fasl-class-loader API compatible to avoid changing the FASL version number.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
4 edited

Legend:

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

    r13148 r13149  
    130130        }
    131131
     132        @Override
     133        //TODO delete this next time the fasl version is bumbed
     134        public LispObject execute(LispObject unused1, LispObject baseName, LispObject unused2) {
     135            return execute(baseName);
     136        }
     137
    132138    };
    133139
  • trunk/abcl/src/org/armedbear/lisp/Lisp.java

    r13144 r13149  
    12931293          if (input == null) {
    12941294                  Debug.trace("Pathname: " + name);
     1295                  Debug.trace("load: " + load);
    12951296                  Debug.trace("LOAD_TRUENAME_FASL: " + truenameFasl);
    12961297                  Debug.trace("LOAD_TRUENAME: " + truename);
  • trunk/abcl/src/org/armedbear/lisp/Load.java

    r13064 r13149  
    343343    // ### *fasl-version*
    344344    // internal symbol
     345
     346    /* TODO when bumping the version for any reason, remember to:
     347     *  - remove the overload taking 3 args in
     348     *    FaslClassLoader.MAKE_FASL_CLASS_LOADER
     349     *  - remove the extra args (1 and 3, both NIL) passed to
     350     *    make-fasl-class-loader in compile-file.lisp
     351     *  - delete this comment :)
     352     */
    345353    static final Symbol _FASL_VERSION_ =
    346354        exportConstant("*FASL-VERSION*", PACKAGE_SYS, Fixnum.getInstance(37));
  • trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

    r13135 r13149  
    370370    (let ((*load-truename* *output-file-pathname*)
    371371          (*fasl-loader* (make-fasl-class-loader
    372                           (concatenate 'string "org.armedbear.lisp." (base-classname)))))
     372                          nil
     373                          (concatenate 'string "org.armedbear.lisp." (base-classname))
     374                          nil)))
    373375      (eval form))))
    374376
     
    612614                (write (list 'setq '*fasl-loader*
    613615                             `(sys::make-fasl-class-loader
    614                                ,(concatenate 'string "org.armedbear.lisp." (base-classname)))) :stream out))
     616                               nil
     617                               ,(concatenate 'string "org.armedbear.lisp." (base-classname))
     618                               nil)) :stream out))
    615619              (%stream-terpri out))
    616620
     
    621625               do (write-line line out))))
    622626        (delete-file temp-file)
    623   (remove-zip-cache-entry output-file) ;; Necessary under windows
     627        (remove-zip-cache-entry output-file) ;; Necessary under windows
    624628        (rename-file temp-file2 output-file)
    625629
Note: See TracChangeset for help on using the changeset viewer.