Commit fe4086bb authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.26.67: define-package looks good, BUT we need to somehow avoid unnecessary...

2.26.67: define-package looks good, BUT we need to somehow avoid unnecessary frobbing, as per *upgraded-p*.
parent e9514f6e
......@@ -9,6 +9,7 @@
(:fmakunbound
#:explain #:output-files #:perform #:perform-with-restarts
#:operation-done-p #:compute-action-stamp #:component-depends-on #:mark-operation-done)
(:intern #:stamp #:done-p)
(:export
#:action
#:explain #:operation-description
......
......@@ -14,7 +14,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.26.66" ;; to be automatically updated by bin/bump-revision
:version "2.26.67" ;; to be automatically updated by bin/bump-revision
:depends-on ()
:components
((:file "asdf")))
......
......@@ -4,6 +4,7 @@
(asdf/package:define-package :asdf/bundle
(:fmakunbound #:trivial-system-p)
(:recycle :asdf/bundle :asdf)
(:intern #:build-args #:name-suffix #:prologue-code #:epilogue-code #:static-library)
(:use :common-lisp :asdf/utility :asdf/pathname :asdf/os :asdf/lisp-build
:asdf/component :asdf/system :asdf/find-system :asdf/find-component :asdf/operation
:asdf/action :asdf/lisp-action :asdf/plan :asdf/operate)
......
......@@ -5,7 +5,10 @@
(:recycle :asdf/component :asdf)
(:fmakunbound #:component-relative-pathname #:source-file-type)
(:use :common-lisp :asdf/implementation :asdf/utility :asdf/pathname :asdf/upgrade)
(:intern #:documentation #:long-documentation)
(:intern #:name #:version #:description #:long-description
#:sibling-dependencies #:if-feature #:in-order-to #:inline-methods
#:relative-pathname #:absolute-pathname #:operation-times #:around-compile
#:%encoding #:properties #:parent)
(:export
#:component #:component-find-path
#:component-name #:component-pathname #:component-relative-pathname
......
......@@ -3,6 +3,7 @@
(asdf/package:define-package :asdf/concatenate-source
(:recycle :asdf/concatenate-source :asdf)
(:intern #:translate-output-p #:concatenated-source-file)
(:use :common-lisp :asdf/utility :asdf/os
:asdf/component :asdf/operation :asdf/system :asdf/find-system :asdf/defsystem
:asdf/action :asdf/lisp-action :asdf/bundle)
......
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.66: Another System Definition Facility.
;;; This is ASDF 2.26.67: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -3,6 +3,7 @@
(asdf/package:define-package :asdf/lisp-action
(:recycle :asdf/lisp-action :asdf)
(:intern #:proclamations #:flags)
(:use :common-lisp :asdf/utility :asdf/lisp-build
:asdf/component :asdf/system :asdf/find-component :asdf/operation :asdf/action)
(:export
......
......@@ -24,7 +24,7 @@
(defmacro DBG (tag &rest exprs)
"simple debug statement macro:
outputs a tag plus a list of variable and their values, returns the last value"
;"if not in debugging mode, just compute and return last value"
;;"if not in debugging mode, just compute and return last value"
#-DBGXXX (declare (ignore tag)) #-DBGXXX (car (last exprs)) #+DBGXXX
(let ((res (gensym))(f (gensym)))
`(let (,res (*print-readably* nil))
......@@ -149,11 +149,12 @@ when the symbol is not found."
(imported (make-hash-table :test 'equal)) ; string to bool
(exported (make-hash-table :test 'equal)) ; string to bool
(inherited (make-hash-table :test 'equal)) ; string to package name
(name (string name))
(nicknames (mapcar #'string nicknames))
(names (cons name nicknames))
(previous (DBG :p names (mapcar 'find-package names) (remove-duplicates (mapcar #'find-package names) :from-end t)))
(previous (remove-duplicates (remove nil (mapcar #'find-package names)) :from-end t))
(discarded (cdr previous))
(package (or (first previous) (make-package name :nicknames nicknames))))
(DBG :foo)
(package (DBG :xxx names previous discarded (or (first previous) (make-package name :nicknames nicknames)))))
(labels
((ensure-shadowing-import (sym p)
(let* ((name (string sym))
......@@ -230,7 +231,7 @@ when the symbol is not found."
((eq previous package))
((or (not previous) (not (member (symbol-package recycled) recycle)))
(when intern (intern* name package)))
(t (unintern* name package) (unintern* recycled previous) (import recycled package))))))
(t (unintern* name package nil) (unintern* recycled previous) (import recycled package))))))
(ensure-export (name p)
(multiple-value-bind (symbol status) (find-symbol name p)
(assert status)
......@@ -260,7 +261,7 @@ when the symbol is not found."
(loop :for p :in discarded
:for n = (remove-if #'(lambda (x) (member x names :test 'equal))
(package-names p))
:do (DBG (package-names discarded) n)
:do (DBG :baz (package-names p) n)
:do (if n (rename-package discarded (first n) (rest n))
(delete-package* discarded)))
(rename-package package name nicknames)
......
......@@ -8,6 +8,9 @@
:asdf/component :asdf/system :asdf/find-system :asdf/find-component
:asdf/operation :asdf/action)
#+gcl<2.7 (:shadowing-import-from :asdf/implementation #:type-of)
(:intern #:planned-p #:index #:forced #:forced-not #:total-action-count
#:planned-action-count #:planned-output-action-count #:visited-actions
#:visiting-action-set #:visiting-action-list #:actions-r)
(:export
#:component-operation-time #:mark-operation-done
#:plan-traversal #:sequential-plan
......
......@@ -6,6 +6,8 @@
(:fmakunbound #:find-system #:system-source-file #:system-relative-pathname #:builtin-system-p)
(:use :common-lisp :asdf/utility :asdf/pathname :asdf/os :asdf/upgrade
:asdf/component)
(:intern #:children #:children-by-name #:default-component-class
#:author #:maintainer #:licence #:source-file #:defsystem-depends-on)
(:export
#:child-component #:parent-component #:module #:system
#:component-children-by-name #:component-children #:compute-children-by-name
......
......@@ -24,7 +24,7 @@
;; "2.345.6" would be a development version in the official upstream
;; "2.345.0.7" would be your seventh local modification of official release 2.345
;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(asdf-version "2.26.66")
(asdf-version "2.26.67")
(existing-asdf (find-class 'component nil))
(existing-version *asdf-version*)
(already-there (equal asdf-version existing-version)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment