Skip to content
Snippets Groups Projects
Commit b90d556a authored by Robert P. Goldman's avatar Robert P. Goldman
Browse files

Merge branch 'master' into bug1335323

parents 6a8e98b9 c9c9cc33
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
:licence "MIT" :licence "MIT"
:description "Another System Definition Facility" :description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems." :long-description "ASDF builds Common Lisp software organized into defined systems."
:version "3.1.2.6" ;; to be automatically updated by make bump-version :version "3.1.2.7" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8 #+asdf3 :encoding #+asdf3 :utf-8
:class #.(if (find-class 'package-inferred-system nil) 'package-inferred-system 'system) :class #.(if (find-class 'package-inferred-system nil) 'package-inferred-system 'system)
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*- ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
;;; This is ASDF 3.1.2.6: Another System Definition Facility. ;;; This is ASDF 3.1.2.7: Another System Definition Facility.
;;; ;;;
;;; Feedback, bug reports, and patches are all welcome: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
......
...@@ -335,7 +335,7 @@ of the function will be returned rather than interpreted as a boolean designatin ...@@ -335,7 +335,7 @@ of the function will be returned rather than interpreted as a boolean designatin
(dump-hook *image-dump-hook*) (dump-hook *image-dump-hook*)
#+clozure prepend-symbols #+clozure (purify t) #+clozure prepend-symbols #+clozure (purify t)
#+sbcl compression #+sbcl compression
#+(and sbcl windows) application-type) #+(and sbcl os-windows) application-type)
"Dump an image of the current Lisp environment at pathname FILENAME, with various options. "Dump an image of the current Lisp environment at pathname FILENAME, with various options.
First, finalize the image, by evaluating the POSTLUDE as per EVAL-INPUT, then calling each of First, finalize the image, by evaluating the POSTLUDE as per EVAL-INPUT, then calling each of
...@@ -409,7 +409,7 @@ or COMPRESSION on SBCL, and APPLICATION-TYPE on SBCL/Windows." ...@@ -409,7 +409,7 @@ or COMPRESSION on SBCL, and APPLICATION-TYPE on SBCL/Windows."
(when compression (list :compression compression)) (when compression (list :compression compression))
;;--- only save runtime-options for standalone executables ;;--- only save runtime-options for standalone executables
(when executable (list :toplevel #'restore-image :save-runtime-options t)) (when executable (list :toplevel #'restore-image :save-runtime-options t))
#+(and sbcl windows) ;; passing :application-type :gui will disable the console window. #+(and sbcl os-windows) ;; passing :application-type :gui will disable the console window.
;; the default is :console - only works with SBCL 1.1.15 or later. ;; the default is :console - only works with SBCL 1.1.15 or later.
(when application-type (list :application-type application-type))))) (when application-type (list :application-type application-type)))))
#-(or allegro clisp clozure cmu gcl lispworks sbcl scl) #-(or allegro clisp clozure cmu gcl lispworks sbcl scl)
......
...@@ -67,7 +67,7 @@ previously-loaded version of ASDF." ...@@ -67,7 +67,7 @@ previously-loaded version of ASDF."
;; "3.4.5.67" would be a development version in the official branch, on top of 3.4.5. ;; "3.4.5.67" would be a development version in the official branch, on top of 3.4.5.
;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5 ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(asdf-version "3.1.2.6") (asdf-version "3.1.2.7")
(existing-version (asdf-version))) (existing-version (asdf-version)))
(setf *asdf-version* asdf-version) (setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version))) (when (and existing-version (not (equal asdf-version existing-version)))
......
"3.1.2.6" "3.1.2.7"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment