From 1b22bb2949ffb10094e51e49bfef88c8f70c7cfa Mon Sep 17 00:00:00 2001 From: Liam Healy <lnp@healy.washington.dc.us> Date: Fri, 16 Jan 2009 17:55:21 -0500 Subject: [PATCH] Remove cl-utilities dependence GSLL is no longer dependent on cl-utilities, so remove it. Generic function #'name needs to be loaded before the obsolete-gsl-version condition is defined, otherwise CLISP complains. Conditionalize away a couple more 64 bit tests that were overlooked. --- documentation/index.html | 10 ++++------ gsll.asd | 6 +++--- init/init.lisp | 4 ++-- tests/matrix-copy.lisp | 2 ++ tests/vector-copy.lisp | 2 ++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/documentation/index.html b/documentation/index.html index 68a872bb..66f27416 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -112,7 +112,6 @@ combination for which the following are supported:</p> version 0.10.0 or newer; callbacks and <code>foreign-funcall</code> must be supported </li> <li><a href="http://www.cliki.net/trivial-garbage">trivial-garbage</a> -<li><a href="http://common-lisp.net/project/cl-utilities/">cl-utilities</a> </li> <li><a href="http://www.cliki.net/asdf">ASDF</a></li></ul> @@ -151,11 +150,10 @@ Then in Lisp, load the system: <ul> <li><code>gsll get_git git://repo.or.cz/gsll.git</code></li> <li><code>trivial-garbage get_darcs http://common-lisp.net/~loliveira/darcs/trivial-garbage</code></li> - <li><code>cl-utilities get_cvs_clnet</code></li> </ul> <p>and add <ul> - <li><code>gsll cffi trivial-garbage cl-utilities</code></li> + <li><code>gsll cffi trivial-garbage</code></li> </ul> <p> to <code>dependencies</code> and execute @@ -165,7 +163,7 @@ from within the clbuild directory: </ul> <h3>With Debian or Ubuntu</h3> <ul> - <li><code>sudo aptitude install libgsl0-dev cl-cffi cl-utilities</code></li> + <li><code>sudo aptitude install libgsl0-dev cl-cffi</code></li> <li><code>git clone git://repo.or.cz/gsll.git</code></li> <li><code>darcs get http://common-lisp.net/~loliveira/darcs/trivial-garbage</code></li> <li><code>clc-register-user-package trivial-garbage/trivial-garbage.asd</code></li> @@ -232,7 +230,7 @@ T examples also serve as a regression (unit) test suite for GSLL.</li> </ul> <p> - Some examples are not yet present, or are too complicated for, the + Some examples are not yet present in, or are too complicated for, the function <code>#'examples</code>. In this case, you need to look in the relevant source file; they are in either a separate file of examples, or at the end of the file of definitions. @@ -359,7 +357,7 @@ and arrays used internally or for function return. <!-- Created: Feb 25 2005 --> <!-- hhmts start --> <small> -Time-stamp: <2009-01-09 13:37:15EST index.html> +Time-stamp: <2009-01-16 09:22:35EST index.html> </small> <!-- hhmts end --> </div> diff --git a/gsll.asd b/gsll.asd index a44ae61f..6e3f5a79 100644 --- a/gsll.asd +++ b/gsll.asd @@ -1,6 +1,6 @@ ;; Definition of GSLL system ;; Liam Healy -;; Time-stamp: <2009-01-15 21:18:57EST gsll.asd> +;; Time-stamp: <2009-01-16 11:13:17EST gsll.asd> ;; $Id$ (asdf:defsystem "gsll" @@ -9,7 +9,7 @@ :version "0" :author "Liam M. Healy" :licence "LLGPL v3, FDL" - :depends-on (cffi trivial-garbage cl-utilities) + :depends-on (cffi trivial-garbage) :components ((:module init :components @@ -24,7 +24,7 @@ :depends-on (init conditions element-types number-conversion)) (:file "defmfun" :depends-on (init element-types interface)) (:file "defmfun-array" :depends-on (defmfun)) - (:file "defmfun-single" :depends-on (defmfun)) + (:file "defmfun-single" :depends-on (defmfun mobject)) (:file "callback" :depends-on (init)) (:file "generate-examples" :depends-on (init)))) (:module floating-point diff --git a/init/init.lisp b/init/init.lisp index 770293ac..8076a1c3 100644 --- a/init/init.lisp +++ b/init/init.lisp @@ -1,11 +1,11 @@ ;; Load GSL ;; Liam Healy Sat Mar 4 2006 - 18:53 -;; Time-stamp: <2009-01-15 22:10:30EST init.lisp> +;; Time-stamp: <2009-01-16 11:06:20EST init.lisp> ;; $Id$ (defpackage gsll (:nicknames :gsl) - (:use :common-lisp :cffi :cl-utilities)) + (:use :common-lisp :cffi)) (cffi:define-foreign-library libgslcblas (:darwin diff --git a/tests/matrix-copy.lisp b/tests/matrix-copy.lisp index e5e51c90..588d555c 100644 --- a/tests/matrix-copy.lisp +++ b/tests/matrix-copy.lisp @@ -108,6 +108,7 @@ (MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))))) + #+int64 (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123))) (MULTIPLE-VALUE-LIST @@ -116,6 +117,7 @@ (MAKE-MARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))))) + #+int64 (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((67 44 189) (116 163 140) (161 215 98))) (MULTIPLE-VALUE-LIST diff --git a/tests/vector-copy.lisp b/tests/vector-copy.lisp index 322a669f..9060b50a 100644 --- a/tests/vector-copy.lisp +++ b/tests/vector-copy.lisp @@ -91,6 +91,7 @@ 32) :INITIAL-CONTENTS '(67 44 189)))))) + #+int64 (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71)) (MULTIPLE-VALUE-LIST (CL-ARRAY @@ -100,6 +101,7 @@ :INITIAL-CONTENTS '(-64 -68 71)))))) + #+int64 (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189)) (MULTIPLE-VALUE-LIST (CL-ARRAY -- GitLab