Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
asdf
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Didier Verna
asdf
Commits
548d0c9a
Commit
548d0c9a
authored
Jan 13, 2013
by
Francois-Rene Rideau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2.26.87: use read-from-string, not eval-input, for ensure-function, as in the good/bad old days.
Also, improve the bump-version script.
parent
f3e6b7d1
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
51 additions
and
30 deletions
+51
-30
Makefile
Makefile
+4
-1
asdf.asd
asdf.asd
+1
-1
bin/bump-version
bin/bump-version
+28
-16
header.lisp
header.lisp
+1
-1
image.lisp
image.lisp
+10
-7
plan.lisp
plan.lisp
+2
-0
stream.lisp
stream.lisp
+2
-1
upgrade.lisp
upgrade.lisp
+1
-1
utility.lisp
utility.lisp
+1
-1
version.lisp-expr
version.lisp-expr
+1
-1
No files found.
Makefile
View file @
548d0c9a
...
...
@@ -59,7 +59,10 @@ build/asdf.lisp: $(wildcard *.lisp)
cat
$(driver_lisp)
$(asdf_lisp)
>
$@
wc
:
wc
$(driver_lisp)
$(asdf_lisp)
|
sort
-n
@
wc
$(driver_lisp)
|
sort
-n
;
echo
;
\
wc
$(asdf_lisp)
|
sort
-n
;
\
echo
;
\
wc
$(driver_lisp)
$(asdf_lisp)
|
tail
-n
1
wc-driver
:
wc
$(driver_lisp)
...
...
asdf.asd
View file @
548d0c9a
...
...
@@ -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.8
6
"
;; to be automatically updated by bin/bump-revision
:version
"2.26.8
7
"
;; 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
))))
...
...
bin/bump-version
View file @
548d0c9a
...
...
@@ -13,23 +13,34 @@
(
asdf-debug
)
(
resume-image
)
(
defun afile
(
x
)
(
asdf:system-relative-pathname :asdf x
))
(
defparameter
*
version-file
*
(
afile
"version.lisp-expr"
))
(
defparameter
*
old-version
*
(
safe-read-first-file-form
*
version-file
*
))
(
defparameter
*
argv
*
(
command-line-arguments
))
(
defparameter
*
old-version
*
nil
)
(
defparameter
*
new-version
*
nil
)
(
defun next-version
(
v
)
(
let
((
pv
(
parse-version v
)))
(
incf
(
third pv
))
(
unparse-version pv
)))
(
defparameter
*
new-version
*
(
or
(
first
*
argv
*
)
(
next-version
*
old-version
*
)))
(
defun version-from-file
()
(
safe-read-first-file-form
*
version-file
*
))
(
defun versions-from-argv
(
argv
)
(
ecase
(
length argv
)
((
2
)
(
values
(
second argv
)
(
first argv
)))
((
1
)
(
values
(
version-from-file
)
(
first argv
)))
((
0
)
(
let
((
old
(
version-from-file
)))
(
values old
(
next-version old
))))))
(
multiple-value-setq
(
*
old-version
*
*
new-version
*
)
(
versions-from-argv
*
command-line-arguments
*
))
(
format t
"Bumping ASDF version from ~A to ~A~%"
*
old-version
*
*
new-version
*
)
...
...
@@ -37,18 +48,19 @@
(defun maybe-replace-file (file transformer
&key (reader '
read-file-string
)
(
writer nil
)
(
comparator
'equal)
(
writer nil
)
(
comparator
'equal
p
)
(external-format *utf-8-external-format*))
(let* ((old-contents (funcall reader file))
(new-contents (funcall transformer old-contents)))
(unless (funcall comparator old-contents new-contents)
(let ((written-contents
(if writer
(with-output (s ())
(funcall writer s new-contents))
new-contents)))
(check-type written-contents (or string (byte-vector)))
(clobber-file-with-vector file written-contents :external-format external-format)))))
(if (funcall comparator old-contents new-contents)
(format t "No changes for file ~A~%" file)
(let ((written-contents
(if writer
(with-output (s ())
(funcall writer s new-contents))
new-contents)))
(check-type written-contents (or string (byte-vector)))
(clobber-file-with-vector file written-contents :external-format external-format)))))
(defun version-transform (text)
(flet ((v1 (ver) (format nil "~S" ver))
...
...
@@ -56,10 +68,10 @@
(f (fun text)
(cl-ppcre:regex-replace-all
(funcall fun *old-version*) text (funcall fun *new-version*))))
(f #'
v
1
(
f
#'v2
text))))
(f #'
v
2
(
f
#'v1
text))))
(
defparameter
*
versioned-files
*
'("version.lisp-expr" "asdf.asd" "build/asdf.lisp" "upgrade.lisp"))
'("version.lisp-expr" "asdf.asd" "
header.lisp" "
build/asdf.lisp" "upgrade.lisp"))
(defun transform-file (x)
(format t "Transforming file ~A~%" x)
...
...
header.lisp
View file @
548d0c9a
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.8
6
: Another System Definition Facility.
;;; This is ASDF 2.26.8
7
: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
...
...
image.lisp
View file @
548d0c9a
...
...
@@ -13,7 +13,7 @@
#:register-image-resume-hook
#:register-image-dump-hook
#:call-image-resume-hook
#:call-image-dump-hook
#:initialize-asdf-utilities
#:resume
#:do-resume
#:dump-image
#:resume
-image
#:run-resumed-program
#:dump-image
))
(
in-package
:asdf/image
)
...
...
@@ -205,15 +205,18 @@ if we are not called from a directly executable image dumped by XCVB."
(
defun
setup-command-line-arguments
()
(
setf
*command-line-arguments*
(
command-line-arguments
)))
(
defun*
resume-program
(
&key
(
post-image-restart
*post-image-restart*
)
(
entry-point
*entry-point*
))
(
call-image-resume-hook
)
(
with-safe-io-syntax
()
(
let
((
*read-eval*
t
))
(
when
post-image-restart
(
eval-input
post-image-restart
))))
(
defun*
resume-image
(
&key
(
post-image-restart
*post-image-restart*
)
(
entry-point
*entry-point*
)
(
image-resume-hook
*image-resume-hook*
))
(
call-functions
image-resume-hook
)
(
when
post-image-restart
(
with-safe-io-syntax
()
(
let
((
*read-eval*
t
))
(
eval-input
post-image-restart
))))
(
when
entry-point
(
apply
entry-point
*command-line-arguments*
)))
(
defun*
r
esume
()
(
defun*
r
un-resumed-program
()
(
with-coded-exit
()
(
let
((
ret
(
resume-program
)))
(
if
(
typep
ret
'integer
)
...
...
plan.lisp
View file @
548d0c9a
...
...
@@ -16,9 +16,11 @@
#:planned-action-status
#:plan-action-status
#:action-already-done-p
#:circular-dependency
#:circular-dependency-actions
#:node-for
#:needed-in-image-p
#:action-index
#:action-planned-p
#:plan-record-dependency
#:visiting-action-p
#:normalize-forced-systems
#:action-forced-p
#:action-forced-not-p
#:visit-dependencies
#:compute-action-stamp
#:traverse-action
#:circular-dependency
#:circular-dependency-actions
#:call-while-visiting-action
#:while-visiting-action
#:traverse-sequentially
#:traverse
#:perform-plan
#:plan-operates-on-p
))
...
...
stream.lisp
View file @
548d0c9a
...
...
@@ -129,7 +129,8 @@ Otherwise, signal an error."
Useful for portably flushing I/O before user input or program exit."
;; CCL notably buffers its stream output by default.
(
dolist
(
s
(
append
streams
(
list
*stderr*
*error-output*
*standard-output*
*trace-output*
*debug-io*
)))
(
list
*stderr*
*error-output*
*standard-output*
*trace-output*
*debug-io*
*terminal-io*
*debug-io*
*query-io*
)))
(
ignore-errors
(
finish-output
s
)))
(
values
))
...
...
upgrade.lisp
View file @
548d0c9a
...
...
@@ -32,7 +32,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.8
6
"
)
(
asdf-version
"2.26.8
7
"
)
(
existing-asdf
(
find-class
(
find-symbol*
:component
:asdf
nil
)
nil
))
(
existing-version
*asdf-version*
)
(
already-there
(
equal
asdf-version
existing-version
)))
...
...
utility.lisp
View file @
548d0c9a
...
...
@@ -230,7 +230,7 @@ starting the separation from the end, e.g. when called with arguments
(
cons
(
eval
`
(
function
,
fun
)))
(
string
(
eval
`
(
function
,
(
with-standard-io-syntax
(
let
((
*package*
(
find-package
package
)))
(
eval
-string
fun
))))))))
(
read-from
-string
fun
))))))))
(
defun*
call-function
(
function-spec
&rest
arguments
)
(
apply
(
ensure-function
function-spec
)
arguments
))
...
...
version.lisp-expr
View file @
548d0c9a
"2.26.8
6
"
"2.26.8
7
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment