mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-16 06:12:25 -08:00
Code Issues Projects Releases Packages Wiki Activity

Allow ASDF to work with the bytecodes compiler

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2011-06-04 16:20:10 +02:00
parent be37052180
commit ecc96a60f0
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/asdf/asdf-ecl.lisp
View file

@ -12,7 +12,6 @@
#+xcvb (module (:depends-on ("asdf")))
(in-package :asdf)
(require 'cmp)
;;;
;;; COMPILE-OP / LOAD-OP
@ -419,7 +418,6 @@
(export '(make-build load-fasl-op prebuilt-system))
(push '("fasb" . si::load-binary) si::*load-hooks*)
(require 'cmp)
(defvar *require-asdf-operator* 'load-op)
(defun module-provide-asdf (name)

22
contrib/asdf/asdf.lisp
View file

@ -62,7 +62,7 @@
(setf excl::*autoload-package-name-alist*
(remove "asdf" excl::*autoload-package-name-alist*
:test 'equalp :key 'car))
#+(and ecl (not ecl-bytecmp)) (require :cmp)
#+ecl (unless (member :ecl-bytecmp *features*) (require :cmp))
#+(and (or win32 windows mswindows mingw32) (not cygwin)) (pushnew :asdf-windows *features*)
#+(or unix cygwin) (pushnew :asdf-unix *features*))
@ -3218,19 +3218,21 @@ effectively disabling the output translation facility."
(setf output-truename nil)))
(values output-truename warnings-p failure-p))))
#+(and ecl (not ecl-bytecmp))
#+ecl
(setf
*compile-op-compile-file-function*
(lambda (input-file &rest keys &key output-file &allow-other-keys)
(declare (ignore output-file))
(multiple-value-bind (object-file flags1 flags2)
(apply 'compile-file* input-file :system-p t keys)
(values (and object-file
(c::build-fasl (compile-file-pathname object-file :type :fasl)
:lisp-files (list object-file))
object-file)
flags1
flags2))))
(if (member :ecl-bytecmp *features*)
(apply 'compile-file input-file keys)
(multiple-value-bind (object-file flags1 flags2)
(apply 'compile-file* input-file :system-p t keys)
(values (and object-file
(c::build-fasl (compile-file-pathname object-file :type :fasl)
:lisp-files (list object-file))
object-file)
flags1
flags2)))))
#+abcl
(defun* translate-jar-pathname (source wildcard)