Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

*cls-home-dir* changed to *cls-installation-home-dir*, reflecting wha…

…t it really is (after all, what is "home"?).

Signed-off-by: AJ Rossini <blindglobe@gmail.com>
  • Loading branch information...
commit ac61a3495ed790bd9daf18cf895e76c933b82ea1 1 parent 0232a33
Tony Rossini authored
Showing with 18 additions and 22 deletions.
  1. +14 −18 src/config.lisp
  2. +1 −1  src/numerics/cffiglue.lsp
  3. +3 −3 src/packages.lisp
32 src/config.lisp
View
@@ -1,6 +1,6 @@
;;; -*- mode: lisp -*-
-;;; Time-stamp: <2010-09-06 13:46:06 tony>
+;;; Time-stamp: <2010-11-02 11:20:55 tony>
;;; Creation: <2009-03-12 17:14:56 tony>
;;; File: template.lisp
;;; Author: AJ Rossini <blindglobe@gmail.com>
@@ -22,36 +22,32 @@
;;; optimization settings
;; (proclaim '(optimize (safety 2) (space 3) (speed 3)))
-
(in-package :lisp-stat-config)
(defvar *common-lisp-stat-version* "1"
"Version currently loaded and being used. Need to make into a
parseable object for version testing. Currently using integers.")
-(defparameter *cls-home-dir*
+(defparameter *cls-installation-home-dir*
(directory-namestring
(truename (asdf:system-definition-pathname :cls)))
- "Value considered \"home\" for the installation. Requires the use of ASDF to find out where we are.")
-
-#|
-(setf *cls-home-dir*
- ;; #p"/cygdrive/c/local/sandbox/Lisp/CommonLispStat/"w
- ;; #p"/home/tony/sandbox/CommonLispStat.git/"
- #p"/home/tony/sandbox/CLS.git/")
-|#
+ "Value considered \"home\" for the installation. Requires the use
+ of ASDF to find out where we are. But ASDF is required no matter
+ what.")
(macrolet ((ls-dir (root-str)
`(pathname (concatenate 'string
- (namestring *cls-home-dir*) ,root-str)))
+ (namestring *cls-installation-home-dir*) ,root-str)))
(ls-defdir (target-dir-var root-str)
`(defvar ,target-dir-var (ls-dir ,root-str))))
(ls-defdir *cls-asdf-dir* "ASDF/")
(ls-defdir *cls-data-dir* "Data/")
- (ls-defdir *cls-external-dir* "external/")
- ;; reminder of testing
- ;;(macroexpand '(ls-defdir *cls-asdf-dir* "ASDF"))
- ;;(macroexpand-1 '(ls-defdir *cls-asdf-dir* "ASDF"))
- ;;(macroexpand-1 '(ls-dir "ASDF"))
- )
+ (ls-defdir *cls-external-dir* "external/"))
+
+#|
+ Testing
+ (macroexpand '(ls-defdir *cls-asdf-dir* "ASDF"))
+ (macroexpand-1 '(ls-defdir *cls-asdf-dir* "ASDF"))
+ (macroexpand-1 '(ls-dir "ASDF"))
+|#
2  src/numerics/cffiglue.lsp
View
@@ -17,7 +17,7 @@
(cffi:load-foreign-library
(concatenate 'string
- (namestring lisp-stat-config::*cls-home-dir*)
+ (namestring lisp-stat-config::*cls-installation-home-dir*)
"lib/liblispstat"
#+darwin ".dylib"
#-darwin ".so"))
6 src/packages.lisp
View
@@ -1,6 +1,6 @@
;;; -*- mode: lisp -*-
-;;; Time-stamp: <2010-02-08 16:10:40 tony>
+;;; Time-stamp: <2010-11-04 16:45:44 tony>
;;; Creation: <2008-03-11 19:18:34 user>
;;; File: packages.lisp
;;; Author: AJ Rossini <blindglobe@gmail.com>
@@ -39,7 +39,7 @@
(:export *common-lisp-stat-version*
*default-path*
*lsos-files* *basic-files* *ls-files*
- *cls-home-dir* *cls-data-dir* *cls-examples-dir*))
+ *cls-installation-home-dir* *cls-data-dir* *cls-examples-dir*))
(defpackage :lisp-stat-object-system
(:nicknames :ls-objects :lsos)
@@ -453,7 +453,7 @@
(:export
;; lisp-stat-config:
*default-path* *lsos-files* *basic-files* *ls-files*
- *cls-home-dir* *cls-data-dir* *cls-examples-dir*
+ *cls-installation-home-dir* *cls-data-dir* *cls-examples-dir*
;; lsobjects :
defproto defproto2
Please sign in to comment.
Something went wrong with that request. Please try again.