Revision: 4624
Author: edi
URL: http://bknr.net/trac/changeset/4624
For 0.6.4 release
U trunk/thirdparty/cl-fad/CHANGELOG
U trunk/thirdparty/cl-fad/cl-fad.asd
U trunk/thirdparty/cl-fad/corman.lisp
U trunk/thirdparty/cl-fad/doc/index.html
U trunk/thirdparty/cl-fad/fad.lisp
U trunk/thirdparty/cl-fad/load.lisp
U trunk/thirdparty/cl-fad/openmcl.lisp
U trunk/thirdparty/cl-fad/packages.lisp
U trunk/thirdparty/cl-fad/test.lisp
Modified: trunk/thirdparty/cl-fad/CHANGELOG
===================================================================
--- trunk/thirdparty/cl-fad/CHANGELOG 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/CHANGELOG 2010-11-18 11:12:06 UTC (rev 4624)
@@ -1,3 +1,7 @@
+Version 0.6.4
+2010-11-18
+Adapt to newer ClozureCL version (patch from Zach Beane, thanks to Chun Tian and Ralph Moritz as well)
+
Version 0.6.3
2009-09-30
Removed dependency on :SB-EXECUTABLE (thanks to Attila Lendvai and Tobias Rittweiler)
Modified: trunk/thirdparty/cl-fad/cl-fad.asd
===================================================================
--- trunk/thirdparty/cl-fad/cl-fad.asd 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/cl-fad.asd 2010-11-18 11:12:06 UTC (rev 4624)
@@ -1,7 +1,7 @@
;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
;;; $Header: /usr/local/cvsrep/cl-fad/cl-fad.asd,v 1.21 2009/09/30 14:23:09 edi Exp $
-;;; Copyright (c) 2004-2009, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2004-2010, Dr. Edmund Weitz. All rights reserved.
;;; Redistribution and use in source and binary forms, with or without
;;; modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
#+:allegro (cl:require :osi)
(asdf:defsystem #:cl-fad
- :version "0.6.3"
+ :version "0.6.4"
:serial t
:components ((:file "packages")
#+:cormanlisp (:file "corman")
Modified: trunk/thirdparty/cl-fad/corman.lisp
===================================================================
--- trunk/thirdparty/cl-fad/corman.lisp 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/corman.lisp 2010-11-18 11:12:06 UTC (rev 4624)
@@ -1,7 +1,7 @@
;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL; Base: 10 -*-
;;; $Header: /usr/local/cvsrep/cl-fad/corman.lisp,v 1.5 2009/09/30 14:23:09 edi Exp $
-;;; Copyright (c) 2004-2009, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2004-2010, Dr. Edmund Weitz. All rights reserved.
;;; Redistribution and use in source and binary forms, with or without
;;; modification, are permitted provided that the following conditions
Modified: trunk/thirdparty/cl-fad/doc/index.html
===================================================================
--- trunk/thirdparty/cl-fad/doc/index.html 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/doc/index.html 2010-11-18 11:12:06 UTC (rev 4624)
@@ -73,7 +73,7 @@
CL-FAD together with this documentation can be downloaded from <a
href="http://weitz.de/files/cl-fad.tar.gz">http://weitz.de/files/cl-fad.tar.gz</a>. The
-current version is 0.6.3.
+current version is 0.6.4.
<p>
CL-FAD comes with simple system definitions for <a
href="http://www.cliki.net/mk-defsystem">MK:DEFSYSTEM</a> and <a
Modified: trunk/thirdparty/cl-fad/fad.lisp
===================================================================
--- trunk/thirdparty/cl-fad/fad.lisp 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/fad.lisp 2010-11-18 11:12:06 UTC (rev 4624)
@@ -2,7 +2,7 @@
;;; $Header: /usr/local/cvsrep/cl-fad/fad.lisp,v 1.35 2009/09/30 14:23:10 edi Exp $
;;; Copyright (c) 2004, Peter Seibel. All rights reserved.
-;;; Copyright (c) 2004-2009, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2004-2010, Dr. Edmund Weitz. All rights reserved.
;;; Redistribution and use in source and binary forms, with or without
;;; modification, are permitted provided that the following conditions
@@ -272,7 +272,7 @@
file (unix:get-unix-error-msg errno))))
#+:sbcl (sb-posix:rmdir file)
#+:clisp (ext:delete-dir file)
- #+:openmcl (ccl:delete-directory file)
+ #+:openmcl (cl-fad-ccl:delete-directory file)
#+:cormanlisp (win32:delete-directory file)
#+:ecl (si:rmdir file)
#+(or :abcl :digitool) (delete-file file))
Modified: trunk/thirdparty/cl-fad/load.lisp
===================================================================
--- trunk/thirdparty/cl-fad/load.lisp 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/load.lisp 2010-11-18 11:12:06 UTC (rev 4624)
@@ -1,7 +1,7 @@
;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
;;; $Header: /usr/local/cvsrep/cl-fad/load.lisp,v 1.9 2009/09/30 14:23:10 edi Exp $
-;;; Copyright (c) 2004-2009, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2004-2010, Dr. Edmund Weitz. All rights reserved.
;;; Redistribution and use in source and binary forms, with or without
;;; modification, are permitted provided that the following conditions
Modified: trunk/thirdparty/cl-fad/openmcl.lisp
===================================================================
--- trunk/thirdparty/cl-fad/openmcl.lisp 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/openmcl.lisp 2010-11-18 11:12:06 UTC (rev 4624)
@@ -1,7 +1,7 @@
;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CCL; Base: 10 -*-
;;; $Header: /usr/local/cvsrep/cl-fad/openmcl.lisp,v 1.6 2009/09/30 14:23:10 edi Exp $
-;;; Copyright (c) 2004-2009, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2004-2010, Dr. Edmund Weitz. All rights reserved.
;;; Redistribution and use in source and binary forms, with or without
;;; modification, are permitted provided that the following conditions
@@ -27,22 +27,43 @@
;;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-(in-package :ccl)
+(in-package :cl-fad)
(eval-when (:compile-toplevel :load-toplevel :execute)
- (let ((%rmdir-symbol (find-symbol "%RMDIR" :ccl)))
- (unless (and %rmdir-symbol (fboundp %rmdir-symbol))
- (pushnew :no-%rmdir *features*))))
+ (flet ((ccl-function-feature (symbol-name feature)
+ (let ((symbol (find-symbol symbol-name :ccl)))
+ (when (and symbol (fboundp symbol))
+ (pushnew feature *features*)))))
+ (ccl-function-feature "%RMDIR" :ccl-has-%rmdir)
+ (ccl-function-feature "DELETE-DIRECTORY" :ccl-has-delete-directory)))
-#+:no-%rmdir
+(defpackage :cl-fad-ccl
+ (:use :cl)
+ (:export delete-directory)
+ (:import-from :ccl
+ :%realpath
+ :signal-file-error
+ :native-translated-namestring
+ :with-cstrs)
+ #+ccl-has-%rmdir
+ (:import-from :ccl :%rmdir)
+ #+ccl-has-delete-directory
+ (:import-from :ccl :delete-directory))
+
+(in-package :cl-fad-ccl)
+
+#-ccl-has-%rmdir
(defun %rmdir (name)
(with-cstrs ((n name))
(#_rmdir n)))
+;;; ClozureCL 1.6 introduced ccl:delete-directory with semantics that
+;;; are acceptably similar to this "legacy" definition.
+
+#-ccl-has-delete-directory
(defun delete-directory (path)
(let* ((namestring (native-translated-namestring path)))
(when (%realpath namestring)
(let* ((err (%rmdir namestring)))
(or (eql 0 err) (signal-file-error err path))))))
-(export 'delete-directory)
Modified: trunk/thirdparty/cl-fad/packages.lisp
===================================================================
--- trunk/thirdparty/cl-fad/packages.lisp 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/packages.lisp 2010-11-18 11:12:06 UTC (rev 4624)
@@ -1,7 +1,7 @@
;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
;;; $Header: /usr/local/cvsrep/cl-fad/packages.lisp,v 1.12 2009/09/30 14:23:10 edi Exp $
-;;; Copyright (c) 2004-2009, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2004-2010, Dr. Edmund Weitz. All rights reserved.
;;; Redistribution and use in source and binary forms, with or without
;;; modification, are permitted provided that the following conditions
Modified: trunk/thirdparty/cl-fad/test.lisp
===================================================================
--- trunk/thirdparty/cl-fad/test.lisp 2010-10-31 20:23:47 UTC (rev 4623)
+++ trunk/thirdparty/cl-fad/test.lisp 2010-11-18 11:12:06 UTC (rev 4624)
@@ -1,7 +1,7 @@
;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-FAD-TEST; Base: 10 -*-
;;; $Header: /usr/local/cvsrep/cl-fad/test.lisp,v 1.12 2009/09/30 14:23:10 edi Exp $
-;;; Copyright (c) 2004-2009, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2004-2010, Dr. Edmund Weitz. All rights reserved.
;;; Redistribution and use in source and binary forms, with or without
;;; modification, are permitted provided that the following conditions
