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

Merge branch 'master' into minimakefile

Conflicts:
	Makefile
parents a659b891 fc2dabe0
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@
build
asdf.lisp
doc/cmucl/
doc/asdf/
doc/asdf.aux
doc/asdf.cp
......@@ -21,9 +22,13 @@ doc/asdf.tps
doc/asdf.vr
doc/asdf.vrs
doc/asdf.t2d/
doc/asdf.dvi
*.tmp
LICENSE
tmp/
man/
lib/
*.dribble
*.fas[bcl]
*.fas
......
[submodule "ext/fare-utils"]
path = ext/fare-utils
url = git://common-lisp.net/users/frideau/fare-utils.git
[submodule "ext/fare-quasiquote"]
path = ext/fare-quasiquote
url = git://common-lisp.net/users/frideau/fare-quasiquote.git
[submodule "ext/fare-mop"]
path = ext/fare-mop
url = git://common-lisp.net/users/frideau/fare-mop.git
[submodule "ext/closer-closer-mop"]
path = ext/closer-closer-mop
url = git://git.code.sf.net/p/closer/closer-mop
[submodule "ext/alexandria"]
path = ext/alexandria
url = git://common-lisp.net/projects/alexandria/alexandria.git
[submodule "ext/optima"]
path = ext/optima
url = https://github.com/m2ym/optima.git
[submodule "ext/named-readtables"]
path = ext/named-readtables
url = https://github.com/melisgl/named-readtables.git
[submodule "ext/inferior-shell"]
path = ext/inferior-shell
url = git://common-lisp.net/projects/qitab/inferior-shell.git
[submodule "ext/lisp-invocation"]
path = ext/lisp-invocation
url = git://common-lisp.net/projects/qitab/lisp-invocation.git
[submodule "ext/cl-ppcre"]
path = ext/cl-ppcre
url = https://github.com/edicl/cl-ppcre
......@@ -9,6 +9,8 @@
# Other targets are for maintainer use only.
#
l ?= sbcl
# Default action: bootstrap asdf.lisp
# That's the only thing that we really need before we may invoke asdf-builder.
all: build/asdf.lisp
......@@ -87,6 +89,7 @@ help:
install:
install-asdf:
link-archive:
list-source-registry:
load:
make-archive:
makefile-targets:
......@@ -115,4 +118,3 @@ test-upgrade:
u:
wc:
website:
......@@ -75,7 +75,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "3.1.3" ;; to be automatically updated by make bump-version
:version "3.1.3.5" ;; to be automatically updated by make bump-version
:depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
:class #.(if (find-class 'package-inferred-system nil) 'package-inferred-system 'system)
......
......@@ -10,7 +10,6 @@
#:bundle-op #:bundle-type #:program-system
#:bundle-system #:bundle-pathname-type #:bundlable-file-p #:direct-dependency-files
#:monolithic-op #:monolithic-bundle-op #:operation-monolithic-p
#:fasl-op #:load-fasl-op #:monolithic-fasl-op #:binary-op #:monolithic-binary-op
#:basic-compile-bundle-op #:prepare-bundle-op
#:compile-bundle-op #:load-bundle-op #:monolithic-compile-bundle-op #:monolithic-load-bundle-op
#:lib-op #:monolithic-lib-op
......@@ -530,15 +529,15 @@ Please report to ASDF-DEVEL if this works for you.")))
;;; Backward compatibility with pre-3.1.2 names
(defclass fasl-op (selfward-operation)
((selfward-operation :initform 'compile-bundle-op :allocation :class)))
(defclass load-fasl-op (selfward-operation)
((selfward-operation :initform 'load-bundle-op :allocation :class)))
(defclass binary-op (selfward-operation)
((selfward-operation :initform 'deliver-asd-op :allocation :class)))
(defclass monolithic-fasl-op (selfward-operation)
((selfward-operation :initform 'monolithic-compile-bundle-op :allocation :class)))
(defclass monolithic-load-fasl-op (selfward-operation)
((selfward-operation :initform 'monolithic-load-bundle-op :allocation :class)))
(defclass monolithic-binary-op (selfward-operation)
((selfward-operation :initform 'monolithic-deliver-asd-op :allocation :class)))
;; (defclass fasl-op (selfward-operation)
;; ((selfward-operation :initform 'compile-bundle-op :allocation :class)))
;; (defclass load-fasl-op (selfward-operation)
;; ((selfward-operation :initform 'load-bundle-op :allocation :class)))
;; (defclass binary-op (selfward-operation)
;; ((selfward-operation :initform 'deliver-asd-op :allocation :class)))
;; (defclass monolithic-fasl-op (selfward-operation)
;; ((selfward-operation :initform 'monolithic-compile-bundle-op :allocation :class)))
;; (defclass monolithic-load-fasl-op (selfward-operation)
;; ((selfward-operation :initform 'monolithic-load-bundle-op :allocation :class)))
;; (defclass monolithic-binary-op (selfward-operation)
;; ((selfward-operation :initform 'monolithic-deliver-asd-op :allocation :class)))
(uiop:define-package :asdf/contrib/fasl-op
(:use :common-lisp :uiop
:asdf :asdf/component :asdf/operation :asdf/lisp-action :asdf/bundle))
(in-package :asdf/contrib/fasl-op)
;;; Backward compatibility with pre-3.1.2 names
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun frob-symbol (sym)
(loop :for dest :in '(:asdf/bundle :asdf/interface) :do
(uiop/package::ensure-import
(symbol-name sym) (find-package dest) (symbol-package sym)
(make-hash-table :test 'equal) (make-hash-table :test 'equal)))))
(defmacro declare-ops (&rest ops)
`(progn
,@(loop :for (compat-name current-name) :in ops :append
`((defclass ,compat-name (selfward-operation)
((selfward-operation :initform ',current-name :allocation :class)))
(defmethod output-files ((o ,compat-name) (c component))
(output-files (find-operation o ',current-name) c))
(frob-symbol ',compat-name)))))
(declare-ops
(fasl-op compile-bundle-op)
(load-fasl-op load-bundle-op)
(binary-op deliver-asd-op)
(monolithic-fasl-op monolithic-compile-bundle-op)
(monolithic-load-fasl-op monolithic-load-bundle-op)
(monolithic-binary-op monolithic-deliver-asd-op))
......@@ -2,6 +2,7 @@
@c %**start of header
@setfilename asdf.info
@settitle ASDF Manual
@syncodeindex tp fn
@c %**end of header
@c We use @&key, etc to escape & from TeX in lambda lists --
......@@ -213,13 +214,13 @@ Miscellaneous additional functionality
FAQ
* Where do I report a bug?::
* What has changed between ASDF 1 and ASDF 2?::
* What has changed between ASDF 1 ASDF 2 and ASDF 3?::
* Issues with installing the proper version of ASDF::
* Issues with configuring ASDF::
* Issues with using and extending ASDF to define systems::
* ASDF development FAQs::
``What has changed between ASDF 1, ASDF 2 and ASDF 3?''
``What has changed between ASDF 1, ASDF 2, and ASDF 3?''
* What are ASDF 1 2 3?::
* How do I detect the ASDF version?::
......@@ -232,6 +233,7 @@ FAQ
* ASDF can be upgraded::
* Decoupled release cycle::
* Pitfalls of the transition to ASDF 2::
* What happened to the bundle operations::
Issues with installing the proper version of ASDF
......@@ -4714,14 +4716,14 @@ mailing list
@menu
* Where do I report a bug?::
* What has changed between ASDF 1 and ASDF 2?::
* What has changed between ASDF 1 ASDF 2 and ASDF 3?::
* Issues with installing the proper version of ASDF::
* Issues with configuring ASDF::
* Issues with using and extending ASDF to define systems::
* ASDF development FAQs::
@end menu
@node Where do I report a bug?, What has changed between ASDF 1 and ASDF 2?, FAQ, FAQ
@node Where do I report a bug?, What has changed between ASDF 1 ASDF 2 and ASDF 3?, FAQ, FAQ
@section ``Where do I report a bug?''
ASDF bugs are tracked on launchpad: @url{https://launchpad.net/asdf}.
......@@ -4730,8 +4732,8 @@ If you're unsure about whether something is a bug, or for general discussion,
use the @url{http://common-lisp.net/cgi-bin/mailman/listinfo/asdf-devel,asdf-devel mailing list}
@node What has changed between ASDF 1 and ASDF 2?, Issues with installing the proper version of ASDF, Where do I report a bug?, FAQ
@section ``What has changed between ASDF 1, ASDF 2 and ASDF 3?''
@node What has changed between ASDF 1 ASDF 2 and ASDF 3?, Issues with installing the proper version of ASDF, Where do I report a bug?, FAQ
@section ``What has changed between ASDF 1, ASDF 2, and ASDF 3?''
We released ASDF 2.000 on May 31st 2010,
and ASDF 3.0.0 on May 15th 2013.
......@@ -4767,9 +4769,10 @@ Release ASDF 3.1.2 and later also define the @code{:asdf3.1} feature.
* ASDF can be upgraded::
* Decoupled release cycle::
* Pitfalls of the transition to ASDF 2::
* What happened to the bundle operations::
@end menu
@node What are ASDF 1 2 3?, How do I detect the ASDF version?, What has changed between ASDF 1 and ASDF 2?, What has changed between ASDF 1 and ASDF 2?
@node What are ASDF 1 2 3?, How do I detect the ASDF version?, What has changed between ASDF 1 ASDF 2 and ASDF 3?, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection What are ASDF 1, ASDF 2, and ASDF 3?
ASDF 1 refers to any release earlier than 1.369 or so (from August 2001 to October 2009),
......@@ -4783,7 +4786,7 @@ and any development revision newer than ASDF 1 and older than 2.27 (Feb 1 2013).
ASDF 3 refers to releases from 2.27 (Feb 1 2013) to 2.33 and 3.0.0 onward (May 15 2013).
2.27 to 2.33 count as pre-releases to ASDF 3.
@node How do I detect the ASDF version?, ASDF can portably name files in subdirectories, What are ASDF 1 2 3?, What has changed between ASDF 1 and ASDF 2?
@node How do I detect the ASDF version?, ASDF can portably name files in subdirectories, What are ASDF 1 2 3?, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection How do I detect the ASDF version?
@findex asdf-version
@cindex *features*
......@@ -4810,7 +4813,7 @@ If you are experiencing problems or limitations of any sort with ASDF 1 or ASDF
we recommend that you should upgrade to the latest release, be it ASDF 3 or other.
@node ASDF can portably name files in subdirectories, Output translations, How do I detect the ASDF version?, What has changed between ASDF 1 and ASDF 2?
@node ASDF can portably name files in subdirectories, Output translations, How do I detect the ASDF version?, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection ASDF can portably name files in subdirectories
Common Lisp namestrings are not portable,
......@@ -4841,7 +4844,7 @@ must now be written with the @code{#p} syntax:
@xref{The defsystem grammar,,Pathname specifiers}.
@node Output translations, Source Registry Configuration, ASDF can portably name files in subdirectories, What has changed between ASDF 1 and ASDF 2?
@node Output translations, Source Registry Configuration, ASDF can portably name files in subdirectories, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection Output translations
A popular feature added to ASDF was output pathname translation:
......@@ -4863,7 +4866,7 @@ and support for non-Unix platforms.
@xref{Controlling where ASDF saves compiled files}.
@node Source Registry Configuration, Usual operations are made easier to the user, Output translations, What has changed between ASDF 1 and ASDF 2?
@node Source Registry Configuration, Usual operations are made easier to the user, Output translations, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection Source Registry Configuration
Configuring ASDF used to require special magic
......@@ -4898,7 +4901,7 @@ and also allows for new magic, simpler and more powerful magic.
@xref{Controlling where ASDF searches for systems}.
@node Usual operations are made easier to the user, Many bugs have been fixed, Source Registry Configuration, What has changed between ASDF 1 and ASDF 2?
@node Usual operations are made easier to the user, Many bugs have been fixed, Source Registry Configuration, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection Usual operations are made easier to the user
In ASDF 1, you had to use the awkward syntax
......@@ -4911,7 +4914,7 @@ In ASDF 2, you can use shortcuts for the usual operations:
similarly for @code{compile-system}, @code{test-system}.
@node Many bugs have been fixed, ASDF itself is versioned, Usual operations are made easier to the user, What has changed between ASDF 1 and ASDF 2?
@node Many bugs have been fixed, ASDF itself is versioned, Usual operations are made easier to the user, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection Many bugs have been fixed
The following issues and many others have been fixed:
......@@ -4960,7 +4963,7 @@ The documentation was grossly out of date.
@end itemize
@node ASDF itself is versioned, ASDF can be upgraded, Many bugs have been fixed, What has changed between ASDF 1 and ASDF 2?
@node ASDF itself is versioned, ASDF can be upgraded, Many bugs have been fixed, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection ASDF itself is versioned
Between new features, old bugs fixed, and new bugs introduced,
......@@ -4977,7 +4980,7 @@ Use @code{#+asdf2} to detect presence of ASDF 2,
to check the availability of a version no earlier than required.
@node ASDF can be upgraded, Decoupled release cycle, ASDF itself is versioned, What has changed between ASDF 1 and ASDF 2?
@node ASDF can be upgraded, Decoupled release cycle, ASDF itself is versioned, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection ASDF can be upgraded
When an old version of ASDF was loaded,
......@@ -5002,7 +5005,7 @@ There are still limitations on upgrade, though,
most notably the fact that after you upgrade ASDF,
you must also reload or upgrade all ASDF extensions.
@node Decoupled release cycle, Pitfalls of the transition to ASDF 2, ASDF can be upgraded, What has changed between ASDF 1 and ASDF 2?
@node Decoupled release cycle, Pitfalls of the transition to ASDF 2, ASDF can be upgraded, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection Decoupled release cycle
When vendors were releasing their Lisp implementations with ASDF,
......@@ -5021,7 +5024,7 @@ the practical consequence of which will mean faster convergence
towards the latest version for everyone.
@node Pitfalls of the transition to ASDF 2, , Decoupled release cycle, What has changed between ASDF 1 and ASDF 2?
@node Pitfalls of the transition to ASDF 2, What happened to the bundle operations, Decoupled release cycle, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection Pitfalls of the transition to ASDF 2
The main pitfalls in upgrading to ASDF 2 seem to be related
......@@ -5116,8 +5119,44 @@ as detailed in a @pxref{FAQ,How do I create a system definition where all the so
@end itemize
@node What happened to the bundle operations, , Pitfalls of the transition to ASDF 2, What has changed between ASDF 1 ASDF 2 and ASDF 3?
@subsection What happened to the bundle operations?
@tindex fasl-op (obsolete)
@tindex load-fasl-op (obsolete)
@tindex binary-op (obsolete)
@tindex monolithic-fasl-op (obsolete)
@tindex monolithic-load-fasl-op (obsolete)
@tindex monolithic-binary-op (obsolete)
@tindex compile-bundle-op
@tindex load-bundle-op
@tindex deliver-asd-op
@tindex monolithic-compile-bundle-op
@tindex monolithic-load-bundle-op
@tindex monolithic-deliver-asd-op
Some of the bundle operations were renamed after ASDF 3.1.3, and the old
names have been removed. Old bundle operations, and their modern
equivalents are:
@node Issues with installing the proper version of ASDF, Issues with configuring ASDF, What has changed between ASDF 1 and ASDF 2?, FAQ
@itemize
@item
@code{fasl-op} is now @code{compile-bundle-op}
@item
@code{load-fasl-op} is now @code{load-bundle-op}
@item
@code{binary-op} is now @code{deliver-asd-op}
@item
@code{monolithic-fasl-op} is now @code{monolithic-compile-bundle-op}
@item
@code{monolithic-load-fasl-op} is now @code{monolithic-load-bundle-op}
@item
@code{monolithic-binary-op} is now @code{monolithic-deliver-asd-op}
@end itemize
@node Issues with installing the proper version of ASDF, Issues with configuring ASDF, What has changed between ASDF 1 ASDF 2 and ASDF 3?, FAQ
@section Issues with installing the proper version of ASDF
@menu
......
......@@ -364,9 +364,9 @@ XCL (Peter Graves) <gnooth@gmail.com>
allowed you to create a single-file bundle out of a system,
for easier delivery.
It is now a builtin part of <tt>asdf/defsystem</tt>,
and allows to deliver a single FASL for a system,
or (on supported implementations), a standalone executable program,
or an image containing part of your software precompiled.
and allows users to deliver a single FASL for a system,
a standalone executable program (on supported implementations),
or an image containing your system precompiled.
</li>
<li><tt>asdf-utils</tt> was a collection of utilities that originated with ASDF.
It is now superseded by <tt>uiop</tt>, aka <tt>asdf/driver</tt>,
......@@ -396,20 +396,24 @@ XCL (Peter Graves) <gnooth@gmail.com>
<a id="mailing-lists"></a>
<h3>Mailing Lists</h3>
<ul>
<li><b>asdf-devel</b><!-- <a href="http://lists.common-lisp.net/mailman/listinfo/asdf-devel">asdf-devel</a> -->:
<li><b>asdf-devel</b>
A list for questions, suggestions, bug reports, patches, and so on.
It's for everyone and everything. Please join the conversation!
<a
href="http://mailman.common-lisp.net/cgi-bin/mailman/listinfo/asdf-devel">asdf-devel
mailman site to subscribe</a>
</li>
<li><b>asdf-announce</b><!-- <a href="http://lists.common-lisp.net/mailman/listinfo/asdf-announce">asdf-announce</a> -->:
<li><b>asdf-announce</b>
A low-volume mailing-list for announcements only, mostly regarding new releases.
Posting is restricted to project administrators and to important notices.
Please subscribe to it if you're a Lisp implementation or distribution vendor,
who needs to know when to upgrade the ASDF you distribute,
but are otherwise not interested in day to day design and development.
but are otherwise not interested in day to day design and
development.
<a
href="http://mailman.common-lisp.net/cgi-bin/mailman/listinfo/asdf-announce">asdf-announce
mailman site to subscribe</a>
</li></ul>
<p>To subscribe to these mailing lists, send an email to, e.g.,
asdf-devel+subscribe at common-lisp.net. For more information about
mailing lists at common-lisp.net, see <a href="http://common-lisp.net/listinfo.html">here</a>.</p>
<h3>Contributing</h3>
<p>Join our mailing list, check the code out from git,
......@@ -419,6 +423,10 @@ XCL (Peter Graves) <gnooth@gmail.com>
<a id="news"></a>
<h3>What is happening</h3>
<dl>
<dt>August 2014</dt>
<dd>The ASDF mailing lists have been reestablished, in particular
asdf-announce, which should allow CL implementers better access to only
the information they want about ASDF development.</dd>
<dt>May 2014 to July 2014</dt>
<dd>ASDF bug fixing from 3.1.2 leads to release of 3.1.3, a major bug
fix release. We strongly urge implementors that have shipped with 3.1.2
......
alexandria @ b1c6ee03
Subproject commit b1c6ee03c41e0db97989ae38e70da4d8263e09d1
Subproject commit e6029ed103efe9656e948ef5eb3cb09aec87c58c
closer-closer-mop @ 6bd27708
Subproject commit 6bd277086ff95b0880f5f35aa074e1d35c21ab6f
fare-mop @ 39b7ed60
Subproject commit 39b7ed607894c101ccf92cf95c307120ae18f004
fare-quasiquote @ 8618c249
Subproject commit 8618c24924dec0a4d1008eaeca94f900644097af
fare-utils @ f9c7f881
Subproject commit f9c7f881e26bd1fe429c55d763964e87c3475294
inferior-shell @ d36a06ec
Subproject commit d36a06eca4425853616e6ea53dd8b2a3cf477124
lisp-invocation @ cae5fb1b
Subproject commit cae5fb1b51d44a718b1e93eb97f2eeb824ab6630
Subproject commit a52ddb9f9591dd58adc23f5fa83461376bf99982
Subproject commit 961211ad15b5ae3e207c7dde0b8cd40b2681f90f
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
;;; This is ASDF 3.1.3: Another System Definition Facility.
;;; This is ASDF 3.1.3.5: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -36,7 +36,6 @@
#:component-load-dependencies #:run-shell-command ; deprecated, do not use
#:bundle-op #:monolithic-bundle-op #:precompiled-system #:compiled-file #:bundle-system
#:program-system #:make-build
#:fasl-op #:load-fasl-op #:monolithic-fasl-op #:binary-op #:monolithic-binary-op
#:basic-compile-bundle-op #:prepare-bundle-op
#:compile-bundle-op #:load-bundle-op #:monolithic-compile-bundle-op #:monolithic-load-bundle-op
#:lib-op #:dll-op #:deliver-asd-op #:program-op #:image-op
......
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