From fa9a4fcb0af684d502676f3d98601f1523f228bc Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Thu, 31 Jul 2008 09:16:41 +0200 Subject: [PATCH] first stage finished, moving lisp code out of main dir, while keeping asdf happy. --- lispstat.asd | 55 +++++++++++++--------------------------- ls-user.lisp => src/ls-user.lisp | 0 2 files changed, 18 insertions(+), 37 deletions(-) rename ls-user.lisp => src/ls-user.lisp (100%) diff --git a/lispstat.asd b/lispstat.asd index fc19dce..55b3386 100644 --- a/lispstat.asd +++ b/lispstat.asd @@ -2,39 +2,20 @@ ;;; Copyright (c) 2005--2008, by AJ Rossini ;;; ASDF packaging for CommonLisp Stat ;;; License: BSD, see the top level directory file LICENSE for details. -;;; Time-stamp: <2008-07-22 13:14:04 tony> +;;; Time-stamp: <2008-07-31 09:10:05 tony> ;;; Created: <2005-05-30 17:09:47 blindglobe> - -;; (setf *my-base-directory* -;; #p"/home/tony/sandbox/CLS.git/" -;; #p"/Users/ungil/lisp/CommonLispStat/") - ;; What package should we be in? Contaminating cl-user is probably EVIL. (in-package :cl-user) -;; returns location of LISPSTAT ASDF file -- but can't work until -;; we load it. Not going to do the right thing, I think. -;; more importantly we need to think about what it is tht we are doing -;; to self-initialize. (defvar *lispstat-home-dir* - ;; #p"/home/tony/sandbox/CommonLispStat.git/" - ;; #p"/cygdrive/c/local/sandbox/Lisp/CommonLispStat/" - ;; #p"/Users/ungil/lisp/CommonLispStat/") - ;; #p"/home/rossini/public_html/GIT.repos/CommonLispStat/" - ;; #p"/home/tony/Desktop/sandbox/CLS.git/" (directory-namestring (truename (asdf:system-definition-pathname :lispstat))) "Value considered \"home\" for our data") #| (setf *lispstat-home-dir* - ;; #p"/cygdrive/c/local/sandbox/Lisp/CommonLispStat/" - ;; #p"/home/tony/sandbox/CommonLispStat.git/" - ;; #p"/Users/ungil/lisp/CommonLispStat/") - ;; #p"/home/rossini/public_html/GIT.repos/CommonLispStat/" - ;; #p"/home/tony/Desktop/sandbox/CLS.git/" (directory-namestring (truename (asdf:system-definition-pathname :lispstat)))) |# @@ -66,7 +47,7 @@ ;; (asdf:oos 'asdf:load-op :lift) ;; Unit Testing ;;; MAJOR HACK, FIXME! -(load "/media/disk/Desktop/sandbox/matlisp.git/start.lisp") +;;(load "/media/disk/Desktop/sandbox/matlisp.git/start.lisp") (in-package :cl-user) @@ -77,6 +58,10 @@ ;;; To avoid renaming everything from *.lsp to *.lisp... ;;; borrowed from Cyrus Harmon's work, for example for the ch-util. +;;; NOT secure against serving multiple architectures/hardwares from +;;; the same file system (i.e. PPC and x86 would not be +;;; differentiated). + (defclass lispstat-lsp-source-file (cl-source-file) ()) (defparameter *fasl-directory* (make-pathname :directory '(:relative @@ -87,6 +72,8 @@ #-(or sbcl openmcl clisp cmucl) "fasl" ))) + +;;; Handle Luke's *.lsp suffix (defmethod source-file-type ((c lispstat-lsp-source-file) (s module)) "lsp") (defmethod asdf::output-files :around ((operation compile-op) (c lispstat-lsp-source-file)) @@ -102,7 +89,7 @@ :author "A.J. Rossini " :license "BSD" :description "CommonLispStat (CLS): A System for Statistical Computing with Common Lisp; -based on CLS by Luke Tierney (originally written when Luke was at CMU, apparently). +based on CLS alpha1 by Luke Tierney (originally written when Luke was at CMU, apparently). Last touched 1991, then in 2005--2008." :serial t :depends-on (:cffi :lift) ;; need a matrix library @@ -205,6 +192,7 @@ Last touched 1991, then in 2005--2008." (:module "lisp-stat-core" + :pathname "src/" :depends-on ("proto-objects" "lsbasics" "compound" @@ -217,27 +205,20 @@ Last touched 1991, then in 2005--2008." "linalg" "statistics" "regression") - :file "ls-user") + :components ((:file "ls-user"))) (:module - "lisp-stat-testing" - :depends-on ( :lift "proto-objects" "ls-user" ) + "lisp-stat-unittest" + :depends-on ( "lisp-stat-core") ;; shouldn't need :lift! :pathname "src/unittests/" :components ((:file "unittests") - (:file "unittests-lstypes" :depends-on ("lstypes")) -;; -rw-r--r-- 1 tony tony 5839 2008-07-22 12:22 unittests-arrays.lisp -;; -rw-r--r-- 1 tony tony 4756 2008-07-22 12:22 unittests-data-clos.lisp -;; -rw-r--r-- 1 tony tony 1577 2008-07-22 12:22 unittests-proto.lisp -;; -rw-r--r-- 1 tony tony 1814 2008-07-22 12:22 unittests-regression.lisp + (:file "unittests-lstypes") + ;; "unittests-arrays.lisp" + ;; "unittests-data-clos.lisp" + ;; "unittests-proto.lisp" + ;; "unittests-regression.lisp" )) - - (:static-file "LICENSE") (:static-file "README") )) -#| -;; preparation for modulization... - - -|# diff --git a/ls-user.lisp b/src/ls-user.lisp similarity index 100% rename from ls-user.lisp rename to src/ls-user.lisp -- 2.11.4.GIT