[graphic-forms-cvs] r389 - trunk

[junrue at common-lisp.net]

Author: junrue
Date: Wed Nov  1 17:56:18 2006
New Revision: 389

Removed:
   trunk/build.lisp
Modified:
   trunk/config.lisp
   trunk/graphic-forms-tests.asd
   trunk/tests.lisp
Log:
fix config and load issues; stop using build.lisp locally

Modified: trunk/config.lisp
==============================================================================
--- trunk/config.lisp	(original)
+++ trunk/config.lisp	Wed Nov  1 17:56:18 2006
@@ -43,15 +43,16 @@
 (defvar *closer-mop-dir*      "closer-mop/")
 (defvar *lw-compat-dir*       "lw-compat/")
 (defvar *gf-dir*              "graphic-forms/")
-(defvar *binary-data-dir*     "graphic-forms/src/external-libraries/practicals-1.0.3/binary-data/")
-(defvar *macro-utilities-dir* "graphic-forms/src/external-libraries/practicals-1.0.3/macro-utilities/")
-(defvar *textedit-dir*        "graphic-forms/src/demos/textedit/")
-(defvar *unblocked-dir*       "graphic-forms/src/demos/unblocked/")
-(defvar *gf-tests-dir*        "graphic-forms/src/tests/uitoolkit/")
+(defvar *binary-data-dir*     "src/external-libraries/practicals-1.0.3/Chapter08/")
+(defvar *macro-utilities-dir* "src/external-libraries/practicals-1.0.3/Chapter24/")
+(defvar *textedit-dir*        "src/demos/textedit/")
+(defvar *unblocked-dir*       "src/demos/unblocked/")
 
-(defvar *lisp-unit-file*      "graphic-forms/src/external-libraries/practicals-1.0.3/lisp-unit.lisp")
+(defvar *lisp-unit-file*      "src/external-libraries/lisp-unit/lisp-unit.lisp")
 
 (defun configure-asdf ()
-  (loop for var in '(*binary-data-dir* *cffi-dir* *closer-mop-dir* *lw-compat-dir* *macro-utilities-dir* *gf-dir*)
-        when (symbol-value var)
-        do (pushnew (symbol-value var) asdf:*central-registry* :test #'equal)))
+  (let ((dir-list (list (concatenate 'string *gf-dir* *binary-data-dir*)
+                        (concatenate 'string *gf-dir* *macro-utilities-dir*)
+                        *cffi-dir* *closer-mop-dir* *lw-compat-dir* *gf-dir*)))
+    (loop for var in dir-list
+          do (pushnew var asdf:*central-registry* :test #'equal))))

Modified: trunk/graphic-forms-tests.asd
==============================================================================
--- trunk/graphic-forms-tests.asd	(original)
+++ trunk/graphic-forms-tests.asd	Wed Nov  1 17:56:18 2006
@@ -33,7 +33,7 @@
 ;;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;
 
-(load gfsys::*lisp-unit-file*)
+(load (concatenate 'string gfsys::*gf-dir* gfsys::*lisp-unit-file*))
 
 (defpackage #:graphic-forms.uitoolkit.tests
   (:nicknames #:gft)

Modified: trunk/tests.lisp
==============================================================================
--- trunk/tests.lisp	(original)
+++ trunk/tests.lisp	Wed Nov  1 17:56:18 2006
@@ -34,16 +34,14 @@
 (in-package #:graphic-forms-system)
 
 (defun load-tests ()
-  (setf *default-pathname-defaults* (parse-namestring gfsys::*gf-tests-dir*))
-  (asdf:operate 'asdf:load-op :graphic-forms-tests)
-  (load (merge-pathnames "test-utils.lisp"             *gf-tests-dir*))
-  (load (merge-pathnames "mock-objects"                *gf-tests-dir*))
-  (load (merge-pathnames "color-unit-tests"            *gf-tests-dir*))
-  (load (merge-pathnames "graphics-context-unit-tests" *gf-tests-dir*))
-  (load (merge-pathnames "image-unit-tests"            *gf-tests-dir*))
-  (load (merge-pathnames "icon-bundle-unit-tests"      *gf-tests-dir*))
-  (load (merge-pathnames "layout-unit-tests"           *gf-tests-dir*))
-  (load (merge-pathnames "flow-layout-unit-tests"      *gf-tests-dir*))
-  (load (merge-pathnames "widget-unit-tests"           *gf-tests-dir*))
-  (load (merge-pathnames "item-manager-unit-tests"     *gf-tests-dir*))
-  (load (merge-pathnames "misc-unit-tests"             *gf-tests-dir*)))
+  (let ((tests-dir (concatenate 'string gfsys::*gf-dir* "src/tests/uitoolkit/")))
+    (setf *default-pathname-defaults* (parse-namestring tests-dir))
+    (setf *textedit-dir* (concatenate 'string gfsys::*gf-dir* gfsys::*textedit-dir*))
+    (setf *unblocked-dir* (concatenate 'string gfsys::*gf-dir* gfsys::*unblocked-dir*))
+    (asdf:operate 'asdf:load-op :graphic-forms-tests)
+    (loop for file in '("test-utils.lisp" "mock-objects" "color-unit-tests"
+                        "graphics-context-unit-tests" "image-unit-tests"
+                        "icon-bundle-unit-tests" "layout-unit-tests"
+                        "flow-layout-unit-tests" "widget-unit-tests"
+                        "item-manager-unit-tests" "misc-unit-tests")
+          do (load (merge-pathnames file tests-dir)))))