[graphic-forms-cvs] r63 - trunk

[junrue at common-lisp.net]

Author: junrue
Date: Tue Mar 21 13:20:13 2006
New Revision: 63

Modified:
   trunk/build.lisp
   trunk/config.lisp
   trunk/tests.lisp
Log:
more build system cleanup

Modified: trunk/build.lisp
==============================================================================
--- trunk/build.lisp	(original)
+++ trunk/build.lisp	Tue Mar 21 13:20:13 2006
@@ -36,7 +36,7 @@
 ;;; public use.
 ;;;
 
-(load "config.lisp")
+(load "c:/projects/public/graphic-forms/config.lisp")
 
 (in-package #:graphic-forms-system)
 
@@ -51,40 +51,10 @@
 (setf   *gf-dir*          (concatenate 'string *project-root* "graphic-forms/"))
 (setf   *lisp-unit-file*  (concatenate 'string *library-root* "lisp-unit"))
 
-(defvar *gf-build-dir*    "c:/projects/public/build/graphic-forms/")
 (defvar *gf-tests-dir*    (concatenate 'string *gf-dir* "src/tests/uitoolkit/"))
 
-(defvar *library-build-root*   (concatenate 'string *library-root* "build/"))
-(defvar *cffi-build-dir*       (concatenate 'string *library-build-root* "cffi/"))
-(defvar *closer-mop-build-dir* (concatenate 'string *library-build-root* "closer-mop/"))
-(defvar *lw-compat-build-dir*  (concatenate 'string *library-build-root* "lw-compat/"))
-
-(defvar *build-dirs* (list *cffi-build-dir*
-                           *closer-mop-build-dir*
-                           *lw-compat-build-dir*
-                           *gf-build-dir*))
-
 (defun build ()
-
+  (setf cl-user::*asdf-cache* "c:/projects/public/build/")
   (configure-asdf)
-
-  (when *external-build-dirs*
-    (mapc #'(lambda (dir-str) (ensure-directories-exist (parse-namestring dir-str))) *build-dirs*))
-
-#|
-  (if *external-build-dirs*
-    (chdir *cffi-build-dir*))
-  (asdf:operate 'asdf:load-op :cffi)
-
-  (if *external-build-dirs*
-    (chdir *lw-compat-build-dir*))
-  (asdf:operate 'asdf:load-op :lw-compat)
-
-  (if *external-build-dirs*
-    (chdir *closer-mop-build-dir*))
-  (asdf:operate 'asdf:load-op :closer-mop)
-|#
-
-  (if *external-build-dirs*
-    (chdir *gf-build-dir*))
+  (pushnew *gf-dir* asdf:*central-registry* :test #'equal)
   (asdf:operate 'asdf:load-op :graphic-forms-uitoolkit))

Modified: trunk/config.lisp
==============================================================================
--- trunk/config.lisp	(original)
+++ trunk/config.lisp	Tue Mar 21 13:20:13 2006
@@ -37,8 +37,6 @@
 
 (in-package #:graphic-forms-system)
 
-(defvar *external-build-dirs* nil)
-
 (defvar *cffi-dir*        "cffi-0.9.0/")
 (defvar *closer-mop-dir*  "closer-mop/")
 (defvar *imagemagick-dir* "c:/Program Files/ImageMagick-6.2.6-Q16/")

Modified: trunk/tests.lisp
==============================================================================
--- trunk/tests.lisp	(original)
+++ trunk/tests.lisp	Tue Mar 21 13:20:13 2006
@@ -36,7 +36,5 @@
 (load (compile-file *lisp-unit-file*))
 
 (defun load-tests ()
-  (if *external-build-dirs*
-    (chdir *gf-build-dir*))
   (asdf:operate 'asdf:load-op :graphic-forms-tests)
   (chdir *gf-tests-dir*))