From 2a1fec10801c75d437720648cf14ae561f40f83f Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Fri, 18 Jan 2013 04:31:51 -0500 Subject: [PATCH] 2.26.113: export file-component. --- Makefile | 1 + asdf.asd | 2 +- bin/asdf-builder | 9 ++++++--- header.lisp | 2 +- interface.lisp | 2 +- upgrade.lisp | 2 +- version.lisp-expr | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ef4890bf..d5060d37 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,7 @@ load: build/asdf.lisp install: archive-copy +bump: bump-version bump-version: build/asdf.lisp ./bin/asdf-builder bump-version diff --git a/asdf.asd b/asdf.asd index b8967bb6..77e9deea 100644 --- a/asdf.asd +++ b/asdf.asd @@ -15,7 +15,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.26.112" ;; to be automatically updated by bin/bump-revision + :version "2.26.113" ;; to be automatically updated by bin/bump-revision :depends-on () :components ((:module "build" :components ((:file "asdf")))) :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op generate-asdf)))) diff --git a/bin/asdf-builder b/bin/asdf-builder index c6f4470e..90d779b1 100755 --- a/bin/asdf-builder +++ b/bin/asdf-builder @@ -11,7 +11,8 @@ (defun build-asdf () ;; Make sure asdf.lisp is built. - (asdf:build-system :asdf/generate)) + (build-system :asdf/generate) + (load-system :asdf)) ;;; ASDF directory @@ -53,7 +54,7 @@ (system-source-directory sys) :want-absolute t :want-directory t)) (components - (operated-components + (asdf::operated-components sys :other-systems nil :goal-operation 'load-op :keep-operation 'load-op @@ -116,14 +117,16 @@ (make-tarball-under-build (driver-name) *asdf-dir* (driver-files))) (defun asdf-only-files () - (list* "asdf.asd" "version.lisp-expr" "header.lisp" + (list* "asdf.asd" "build/asdf.lisp" "version.lisp-expr" "header.lisp" (system-source-files :asdf/generate))) (defun asdf-only-name () (format nil "asdf-only-~A" *version*)) (defun make-asdf-only-tarball () + (build-asdf) (make-tarball-under-build (asdf-only-name) *asdf-dir* (asdf-only-files))) (defun make-git-tarball () + (build-asdf) (run-program* (format nil "cd ~S && tar zcf build/asdf-~A.tar.gz build/asdf.lisp $(git ls-files)" /asdf-dir/ *version*))) diff --git a/header.lisp b/header.lisp index 8fd81e67..0489cb02 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- -;;; This is ASDF 2.26.112: Another System Definition Facility. +;;; This is ASDF 2.26.113: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/interface.lisp b/interface.lisp index ee6eb48d..d379a8a0 100644 --- a/interface.lisp +++ b/interface.lisp @@ -49,7 +49,7 @@ #:operation-monolithic-p #:component #:parent-component #:child-component #:system #:module - #:source-file #:c-source-file #:java-source-file + #:file-component #:source-file #:c-source-file #:java-source-file #:cl-source-file #:cl-source-file.cl #:cl-source-file.lsp #:static-file #:doc-file #:html-file :text-file #:source-file-type diff --git a/upgrade.lisp b/upgrade.lisp index 37b4cc92..76f38f3f 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -45,7 +45,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.112") + (asdf-version "2.26.113") (existing-asdf (find-class (find-symbol* :component :asdf nil) nil)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) diff --git a/version.lisp-expr b/version.lisp-expr index 5e357126..9fa3492c 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.26.112" +"2.26.113" -- GitLab