Skip to content
Snippets Groups Projects
Commit 322df950 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Merge branch 'master' into minimakefile

Conflicts:
	Makefile
parents 6f7b1b22 9c4498af
No related branches found
No related tags found
No related merge requests found
...@@ -53,6 +53,7 @@ debian/cl-asdf.postinst.debhelper ...@@ -53,6 +53,7 @@ debian/cl-asdf.postinst.debhelper
debian/cl-asdf.prerm.debhelper debian/cl-asdf.prerm.debhelper
debian/cl-asdf.substvars debian/cl-asdf.substvars
debian/cl-asdf/ debian/cl-asdf/
debian/patches/
debian/files debian/files
.pc .pc
......
...@@ -23,7 +23,7 @@ all: build/asdf.lisp ...@@ -23,7 +23,7 @@ all: build/asdf.lisp
# Download all the development-time dependencies of ASDF: # Download all the development-time dependencies of ASDF:
ext: ext:
git submodule update git submodule update --init
header_lisp := header.lisp header_lisp := header.lisp
driver_lisp := uiop/package.lisp uiop/common-lisp.lisp uiop/utility.lisp uiop/os.lisp uiop/pathname.lisp uiop/filesystem.lisp uiop/stream.lisp uiop/image.lisp uiop/run-program.lisp uiop/lisp-build.lisp uiop/configuration.lisp uiop/backward-driver.lisp uiop/driver.lisp driver_lisp := uiop/package.lisp uiop/common-lisp.lisp uiop/utility.lisp uiop/os.lisp uiop/pathname.lisp uiop/filesystem.lisp uiop/stream.lisp uiop/image.lisp uiop/run-program.lisp uiop/lisp-build.lisp uiop/configuration.lisp uiop/backward-driver.lisp uiop/driver.lisp
......
...@@ -73,7 +73,7 @@ The simplest way to get them is as follows, but read below: ...@@ -73,7 +73,7 @@ The simplest way to get them is as follows, but read below:
make ext make ext
The above make target uses `git submodule update` to download The above make target uses `git submodule update --init` to download
all these libraries using git. If you don't otherwise maintain your all these libraries using git. If you don't otherwise maintain your
own set of carefully controlled CL libraries, that's what you want to use. own set of carefully controlled CL libraries, that's what you want to use.
However, if you do maintain your own set of carefully controlled CL libraries However, if you do maintain your own set of carefully controlled CL libraries
...@@ -183,7 +183,7 @@ How do I navigate this source directory? ...@@ -183,7 +183,7 @@ How do I navigate this source directory?
* `ext/` * `ext/`
* external dependencies, that can be populated with `make ext` * external dependencies, that can be populated with `make ext`
or equivalently with `git submodule update`. or equivalently with `git submodule update --init`.
* `README` * `README`
* this file * this file
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
(require 'sockets) ;; Test the pre-compiled system feature (require 'sockets) ;; Test the pre-compiled system feature
;; Test that we didn't break require for non-asdf modules ;; Test that we didn't break require for non-asdf modules
(progn (progn
(pop #+ecl ext:*module-provider-functions* #+mkcl mkext:*module-provider-functions*) (pop #+ecl ext:*module-provider-functions* #+mkcl mk-ext:*module-provider-functions*)
(require 'serve-event)) (require 'serve-event))
(operate 'dll-op :test-asdf/dll-test) (operate 'dll-op :test-asdf/dll-test)
(let ((dll (first (output-files 'dll-op :test-asdf/dll-test)))) (let ((dll (first (output-files 'dll-op :test-asdf/dll-test))))
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF (list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF
*uiop-directory* *uiop-directory*
;; try finding xcvb's lisp-invocation right next to asdf. ;; try finding xcvb's lisp-invocation right next to asdf.
(subpathname *asdf-directory* "../lisp-invocation/"))) (subpathname *asdf-directory* "ext/lisp-invocation/")))
(unless (find-system :lisp-invocation nil) (unless (find-system :lisp-invocation nil)
;; try harder by enabling the user's source-registry ;; try harder by enabling the user's source-registry
(initialize-source-registry "")) (initialize-source-registry ""))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment