Commit 6e6df93e by Liam M. Healy

Use UIOP instead of Osicat; run on Windows

Eliminate dependence on Osicat (which doesn't run on Windows) and use
UIOP instead, which is already installed by virtue of using ASDF. Use
trivial-features and add conditionals for :windows. Based on a
patch posted by Mirko Vukovic.
parent 80b97f18
;; Definition of GSLL system
;; Liam Healy
;; Time-stamp: <2015-12-05 21:54:38EST gsll.asd>
;; Time-stamp: <2015-12-06 09:39:19EST gsll.asd>
;;
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2015 Liam M. Healy
;; Distributed under the terms of the GNU General Public License
......@@ -33,14 +33,14 @@
#:trivial-garbage
#:alexandria
#:metabang-bind
#:osicat
#:lisp-unit)
#:lisp-unit
#:trivial-features)
:components
((:module init
:components
((:file "init")
(cffi-grovel:grovel-file
"libgsl" :pathname #+unix "libgsl-unix" #-unix "nothing-here"
"libgsl" :pathname #+unix "libgsl-unix" #+windows "libgsl-unix"
:depends-on ("init"))
(:file "utility" :depends-on ("init"))
(:file "forms" :depends-on ("init"))
......
;; N-tuples
;; Liam Healy Sat Feb 3 2007 - 12:53
;; Time-stamp: <2012-01-13 12:01:27EST ntuple.lisp>
;; Time-stamp: <2015-12-06 09:47:29EST ntuple.lisp>
;;
;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
;; Copyright 2007, 2008, 2009, 2011, 2015 Liam M. Healy
;; Distributed under the terms of the GNU General Public License
;;
;; This program is free software: you can redistribute it and/or modify
......@@ -159,7 +159,7 @@
(defparameter *ntuple-example-data-file*
(namestring
(merge-pathnames "ntuple-example.dat" osicat::*temporary-directory*))
(merge-pathnames "ntuple-example.dat" uiop:*temporary-directory*))
;;(asdf:system-relative-pathname :gsll #p"histogram/ntuple-example.dat")
"The full path string of the ntuple example data file. This can be created
with the function #'make-ntuple-example-data.")
......
;; Load GSL
;; Liam Healy Sat Mar 4 2006 - 18:53
;; Time-stamp: <2015-08-23 11:23:16EDT init.lisp>
;; Time-stamp: <2015-12-06 09:45:33EST init.lisp>
;;
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2015 Liam M. Healy
;; Distributed under the terms of the GNU General Public License
......@@ -83,7 +83,7 @@
(:darwin #+ccl #.(ccl:native-translated-namestring
(gsl-config-pathname "libgslcblas.dylib"))
#-ccl #.(gsl-config-pathname "libgslcblas.dylib"))
(:cygwin "cyggslcblas-0.dll")
(:windows (:or "libgslcblas-0.dll" "cyggslcblas-0.dll"))
(:unix (:or "libgslcblas.so.0" "libgslcblas.so"))
(t (:default "libgslcblas")))
......@@ -99,7 +99,7 @@
(:darwin #+ccl #.(ccl:native-translated-namestring
(gsl-config-pathname "libgsl.dylib"))
#-ccl #.(gsl-config-pathname "libgsl.dylib"))
(:cygwin "cyggsl-0.dll")
(:windows (:or "libgsl-0.dll" "cyggsl-0.dll"))
(:unix (:or "libgsl.so.0" "libgsl.so"))
(t (:default "libgsl")))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment