[lisplab-cvs] r50 - system

[Jørn Inge Vestgården]

Author: jivestgarden
Date: Sat Jun  6 08:01:19 2009
New Revision: 50

Log:
ready to delete system directory

Added:
   libs.lisp   (props changed)
      - copied unchanged from r48, /system/libs.lisp
   package.lisp   (props changed)
      - copied unchanged from r48, /system/package.lisp
Removed:
   system/libs.lisp
   system/package.lisp
Modified:
   lisplab.asd
   start.lisp

Modified: lisplab.asd
==============================================================================
--- lisplab.asd	(original)
+++ lisplab.asd	Sat Jun  6 08:01:19 2009
@@ -1,24 +1,31 @@
 
-(defun get-lisplab-lib (name) 
-  (let ((libs #P"system/libs.lisp" #+nil (merge-pathnames #P"system/libs.lisp"
-			       cl-user::*lisplab-home*)))
-    (cdr (assoc name (with-open-file (out libs)
-		       (read out))))))
+(in-package :cl-user)
+(defpackage :asdf-lisplab (:use :asdf :cl))
+(in-package :asdf-lisplab)
+
+(defun get-lisplab-lib (name &optional (libs #P"libs.lisp")) 
+  (cdr (assoc name (with-open-file (out libs)
+		     (read out)))))
 
 (defsystem :lisplab
-  :depends-on (:lisplab-base :lisplab-matlisp :lisplab-fftw))
+  :depends-on 
+  (:lisplab-base 
+   :lisplab-matlisp 
+   :lisplab-fftw
+   ; :slatec Slatec not in system becuase of compilation problems
+   :quadpack))
 
 (defsystem :lisplab-base
-  :depends-on (:slatec :quadpack)
+  :depends-on ()
   :components 
   (
-   (:file "system/package")
+   (:file "package")
 
    ;;
    ;; All core none-matrix stuff (level 0)
    ;;
    (:module :src/core
-    :depends-on ("system/package")
+    :depends-on ("package")
     :serial t
     :components 
     (
@@ -30,19 +37,10 @@
      (:file "level0-infpre")))
 
    ;;
-   ;; Special functions
-   ;;
-   (:module :src/specfunc
-    :depends-on (:src/core) ; and slatec
-    :components 
-    (
-     (:file "level0-specfunc")))
-
-   ;;
    ;; All core matrix stuff (level 1 and 2)
    ;;
    (:module :src/matrix
-    :depends-on (:src/core :src/specfunc)
+    :depends-on (:src/core)
     :serial t
     :components 
     (
@@ -102,20 +100,8 @@
      (:file "level3-rk4")
      (:file "level3-euler")))
 
-
-   ;;
-   ;; Quadpack 
-   ;;
-   (:module :src/integrate
-    :depends-on (:src/core) ; and quadpack
-    :serial t
-    :components 
-    (
-     (:file "quadpack")))
    ))
 
-
-
 (defsystem :lisplab-matlisp
   :depends-on (:lisplab-base)
   :serial t
@@ -151,7 +137,6 @@
      (:file "inv")
      (:file "geev")))))
 
-
 (defsystem :lisplab-fftw
   :depends-on (:lisplab-base)
   :serial t  
@@ -161,7 +146,7 @@
     ;; Blas and Lapack implmentations (Level 3)
     ;;
     (:module :src/fft
-     :depends-on (:fftw-libs)
+     :depends-on ()
      :serial t
      :components 
     ((:file "fftw-ffi-package")
@@ -176,10 +161,17 @@
      (:file "fftw-ffi")
      (:file "level3-fft-fftw")))))
 
-
 (defsystem :quadpack
+  :depends-on (:lisplab-base)
   :components 
-  (     
+  (
+   ;;
+   ;; Quadpack in lisplab
+   ;;
+   (:module :src/integrate
+    :depends-on (:/shared/quadpack/)
+    :components ((:file "quadpack")))
+
    ;;
    ;; Quadpack. Generated with f2cl.
    ;; 
@@ -230,10 +222,18 @@
      (:file "i1mach")
      ))))
 
-
 (defsystem :slatec
+  :depends-on (:lisplab-base)
   :components 
   (
+
+   ;; 
+   ;; Slatec in lisplab
+   ;;
+   (:module :src/specfunc
+    :depends-on (:shared/slatec) 
+    :components ((:file "level0-specfunc")))
+
    (:module :shared/slatec
     :components 
     (

Modified: start.lisp
==============================================================================
--- start.lisp	(original)
+++ start.lisp	Sat Jun  6 08:01:19 2009
@@ -1,32 +1,14 @@
-;; The connection between asdf and your machine settings.
-;; Please hack this file to fit your settings.
 
-(defvar *lisplab-home* 
-  *default-pathname-defaults*
-  "The lisplab directory.")
+(in-package :cl-user)
 
 (defun load-lisplab ()
-  (assert  *lisplab-home*)
-
-  (let ((asdf:*central-registry* 	 
-	 (cons
-	  (merge-pathnames #P"system/" cl-user::*lisplab-home*)
-	  asdf:*central-registry*)))
-    (let ((asdf:*compile-file-failure-behaviour* :ignore))
-      ;; There seems to bee some compilation trouble in SBCL 
-      ;; due to type interference. Should be fixed, not just skipped.
-      (asdf:oos 'asdf:load-op 'slatec))
-    (asdf:oos 'asdf:load-op 'quadpack)
-    (asdf:oos 'asdf:load-op 'lisplab)
-    (asdf:oos 'asdf:load-op 'lisplab-base)
-    (asdf:oos 'asdf:load-op 'lisplab-matlisp)
-    (asdf:oos 'asdf:load-op 'lisplab-fftw)
-    
-    ;; The lisplab system will load all the above systems. 
-    ;; They are listed only to expose their names to the hacker. 
-    (asdf:oos 'asdf:load-op 'lisplab)))
-
+  (asdf:oos 'asdf:load-op 'lisplab)  
+  (let ((asdf:*compile-file-failure-behaviour* :ignore))
+    ;; There seems to bee some compilation trouble in SBCL 
+    ;; due to type interference. Should be fixed, not just skipped.
+    (asdf:oos 'asdf:load-op 'slatec)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (load-lisplab)
+(format t "Lisplab is loaded~%")
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
\ No newline at end of file