Commit ef0427dc authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Merge fixes back from the fare-3.1 branch:

* implement monolithic-load-bundle-op
* test update
parent 08566aa5
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,10 @@ itself.")) ;; operation on a system and its dependencies
    ((gather-op :initform #+(or ecl mkcl) 'lib-op #-(or ecl mkcl) 'compile-bundle-op :allocation :class))
    ((gather-op :initform #+(or ecl mkcl) 'lib-op #-(or ecl mkcl) 'compile-bundle-op :allocation :class))
    (:documentation "Create a single fasl for the system and its dependencies."))
    (:documentation "Create a single fasl for the system and its dependencies."))


  (defclass monolithic-load-bundle-op (monolithic-bundle-op load-bundle-op)
    ((selfward-operation :initform 'monolithic-compile-bundle-op :allocation :class))
    (:documentation "Load a single fasl for the system and its dependencies."))

  (defclass monolithic-lib-op (monolithic-bundle-op lib-op non-propagating-operation) ()
  (defclass monolithic-lib-op (monolithic-bundle-op lib-op non-propagating-operation) ()
    (:documentation "Create a single linkable library for the system and its dependencies."))
    (:documentation "Create a single linkable library for the system and its dependencies."))


+3 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@


(defparameter *good-classes*
(defparameter *good-classes*
  '(build-op
  '(build-op
    compile-bundle-op
    compile-concatenated-source-op
    compile-concatenated-source-op
    compile-op
    compile-op
    concatenate-source-op
    concatenate-source-op
@@ -19,6 +20,7 @@
    fasl-op
    fasl-op
    image-op
    image-op
    lib-op
    lib-op
    load-bundle-op
    load-compiled-concatenated-source-op
    load-compiled-concatenated-source-op
    load-concatenated-source-op
    load-concatenated-source-op
    load-fasl-op
    load-fasl-op
@@ -32,7 +34,7 @@
    monolithic-lib-op
    monolithic-lib-op
    monolithic-load-compiled-concatenated-source-op
    monolithic-load-compiled-concatenated-source-op
    monolithic-load-concatenated-source-op
    monolithic-load-concatenated-source-op
    prepare-fasl-op
    prepare-bundle-op
    prepare-op
    prepare-op
    prepare-source-op
    prepare-source-op
    program-op
    program-op