- cells-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[cells-cvs] CVS update: cell-cultures/cello/cello.lisp cell-cultures/cello/cello.lpr cell-cultures/cello/image.lisp cell-cultures/cello/ix-geometry.lisp cell-cultures/cello/pick.lisp cell-cultures/cello/cellocore.lisp
by Kenny Tilton 04 Jul '04

04 Jul '04

Update of /project/cells/cvsroot/cell-cultures/cello In directory common-lisp.net:/tmp/cvs-serv5472/cello Modified Files: cello.lpr image.lisp ix-geometry.lisp pick.lisp Added Files: cello.lisp Removed Files: cellocore.lisp Log Message: Date: Sun Jul 4 11:59:40 2004 Author: ktilton Index: cell-cultures/cello/cello.lpr diff -u cell-cultures/cello/cello.lpr:1.1 cell-cultures/cello/cello.lpr:1.2 --- cell-cultures/cello/cello.lpr:1.1 Sat Jun 26 11:38:33 2004 +++ cell-cultures/cello/cello.lpr Sun Jul 4 11:59:40 2004 @@ -4,9 +4,9 @@ (defpackage :cello (:export)) -(define-project :name :cellocore +(define-project :name :cello :application-type (intern "Standard EXE" (find-package :keyword)) - :modules (list (make-instance 'module :name "cellocore.lisp") + :modules (list (make-instance 'module :name "cello.lisp") (make-instance 'module :name "datetime.lisp") (make-instance 'module :name "window-macros.lisp") (make-instance 'module :name "clipping.lisp") @@ -55,11 +55,11 @@ (make-instance 'project-module :name "..\\cl-opengl\\cl-opengl") (make-instance 'project-module :name - "c:\\dvl\\cl-ftgl\\cl-ftgl") + "..\\cl-ftgl\\cl-ftgl") (make-instance 'project-module :name - "c:\\dvl\\cl-magick\\cl-magick") + "..\\cl-magick\\cl-magick") (make-instance 'project-module :name - "c:\\dvl\\cl-openal\\cl-openal")) + "..\\cl-openal\\cl-openal")) :libraries nil :distributed-files nil :project-package-name :cello Index: cell-cultures/cello/image.lisp diff -u cell-cultures/cello/image.lisp:1.1 cell-cultures/cello/image.lisp:1.2 --- cell-cultures/cello/image.lisp:1.1 Sat Jun 26 11:38:33 2004 +++ cell-cultures/cello/image.lisp Sun Jul 4 11:59:40 2004 @@ -32,9 +32,8 @@ (defmethod ogl-dsp-list-prep progn (self) (declare (ignore self)) - (assert (not *listingp*))) + (assert (not *ogl-listing-p*))) -(defparameter *listingp* nil) (defvar *window-rendering*) (defmodel ogl-node () @@ -44,9 +43,9 @@ (let ((display-list-name (or .cache (gl-gen-lists 1))) (*window-rendering* (nearest self window))) - (assert (not *listingp*)) + (assert (not *ogl-listing-p*)) (gl-new-list display-list-name gl_compile) - (let ((*listingp* self) + (let ((*ogl-listing-p* self) *selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*) (with-metrics (nil nil "(funcall renderer)" self) (ix-paint self))) Index: cell-cultures/cello/ix-geometry.lisp diff -u cell-cultures/cello/ix-geometry.lisp:1.1 cell-cultures/cello/ix-geometry.lisp:1.2 --- cell-cultures/cello/ix-geometry.lisp:1.1 Sat Jun 26 11:38:33 2004 +++ cell-cultures/cello/ix-geometry.lisp Sun Jul 4 11:59:40 2004 @@ -308,20 +308,6 @@ (:center (floor (- (inset-height .parent) (l-height self)) -2)) (:bottom (- (inset-height .parent) (l-height self)))))) - - - - - - - - -(defmacro ^as-low-as-parent () - `(inset-lb (fm-parent self))) - -(defmacro ^as-right-as-kids () - `(^fm-max-kid pr)) - (defmacro ^fill-parent-right (&optional (inset 0)) `(lr-maintain-pr (- (inset-lr .parent) ,inset))) Index: cell-cultures/cello/pick.lisp diff -u cell-cultures/cello/pick.lisp:1.1 cell-cultures/cello/pick.lisp:1.2 --- cell-cultures/cello/pick.lisp:1.1 Sat Jun 26 11:38:33 2004 +++ cell-cultures/cello/pick.lisp Sun Jul 4 11:59:40 2004 @@ -59,7 +59,7 @@ (glu-perspective 45 aspect 0.1 100.0)) ;;OQ: appropriate for ortho? (gl-matrix-mode gl_model-view) - #+not (let ((*listingp* target) + #+not (let ((*ogl-listing-p* target) *selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*) (with-metrics (nil nil "(funcall renderer)" self) (ix-paint target)))

1 0

[cells-cvs] CVS update: cell-cultures/config.lisp cell-cultures/build.lisp cell-cultures/cello-config.lisp
by Kenny Tilton 04 Jul '04

04 Jul '04

Update of /project/cells/cvsroot/cell-cultures In directory common-lisp.net:/tmp/cvs-serv5472 Modified Files: build.lisp cello-config.lisp Added Files: config.lisp Log Message: Date: Sun Jul 4 11:59:40 2004 Author: ktilton Index: cell-cultures/build.lisp diff -u cell-cultures/build.lisp:1.1 cell-cultures/build.lisp:1.2 --- cell-cultures/build.lisp:1.1 Sat Jun 26 11:38:32 2004 +++ cell-cultures/build.lisp Sun Jul 4 11:59:39 2004 @@ -25,12 +25,15 @@ :type "lisp") *devel-root*)) +;;; --- teach ASDF about LPR files +(let ((d-force t)) + (build-sys d-force "asdf-aclproj")) #-allegro-ide (let ((d-force t)) (pushnew :cells-testing *features*) - (build-sys d-force "cello" "cells") - (build-sys d-force "cello" "cells" "cells-test")) + (build-sys d-force "cells") + (build-sys d-force "cells" "cells-test")) #-allegro-ide (let ((d-force nil)) Index: cell-cultures/cello-config.lisp diff -u cell-cultures/cello-config.lisp:1.1 cell-cultures/cello-config.lisp:1.2 --- cell-cultures/cello-config.lisp:1.1 Sat Jun 26 11:38:32 2004 +++ cell-cultures/cello-config.lisp Sun Jul 4 11:59:39 2004 @@ -1,9 +1,5 @@ (in-package :cl-user) -(defparameter *devel-root* - (make-pathname #+lispworks :host #-lispworks :device "c" - :directory `(:absolute "dvl"))) - (defparameter *cello-directory* (merge-pathnames (make-pathname :directory `(:relative "cello"))

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells-test/person.lisp cell-cultures/cells/cells-test/test.lisp
by Thomas F. Burdick 01 Jul '04

01 Jul '04

Update of /project/cells/cvsroot/cell-cultures/cells/cells-test In directory common-lisp.net:/tmp/cvs-serv23904/cells/cells-test Modified Files: person.lisp test.lisp Log Message: Last fixes, Cells-2 works in SBCL and CMUCL now. Date: Wed Jun 30 20:48:54 2004 Author: tburdick Index: cell-cultures/cells/cells-test/person.lisp diff -u cell-cultures/cells/cells-test/person.lisp:1.1 cell-cultures/cells/cells-test/person.lisp:1.2 --- cell-cultures/cells/cells-test/person.lisp:1.1 Sat Jun 26 11:38:37 2004 +++ cell-cultures/cells/cells-test/person.lisp Wed Jun 30 20:48:54 2004 @@ -67,7 +67,7 @@ (cv-test-person-3) (cv-test-person-4) (cv-test-person-5) - (cv-test-talker) + ;; (cv-test-talker) ) (defun cv-test-person-1 () @@ -269,6 +269,7 @@ (setf *stop* nil) t)))) +#+(or) ; FIXME: this test is borked (defun cv-test-talker () ;; ;; make sure cyclic setf is trapped Index: cell-cultures/cells/cells-test/test.lisp diff -u cell-cultures/cells/cells-test/test.lisp:1.1 cell-cultures/cells/cells-test/test.lisp:1.2 --- cell-cultures/cells/cells-test/test.lisp:1.1 Sat Jun 26 11:38:37 2004 +++ cell-cultures/cells/cells-test/test.lisp Wed Jun 30 20:48:54 2004 @@ -30,7 +30,7 @@ (assert ,form ,places ,datum ,@(or args (list `',form))) (format t "~&ok: ~a~&" ',form)))) -(defun testing () +(eval-when (:load-toplevel :compile-toplevel :execute) (pushnew :cells-testing *features*)) (defvar *failed-tests* ())

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells-test.asd
by Thomas F. Burdick 01 Jul '04

01 Jul '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv23904/cells Modified Files: cells-test.asd Log Message: Last fixes, Cells-2 works in SBCL and CMUCL now. Date: Wed Jun 30 20:48:54 2004 Author: tburdick Index: cell-cultures/cells/cells-test.asd diff -u cell-cultures/cells/cells-test.asd:1.2 cell-cultures/cells/cells-test.asd:1.3 --- cell-cultures/cells/cells-test.asd:1.2 Wed Jun 30 13:56:36 2004 +++ cell-cultures/cells/cells-test.asd Wed Jun 30 20:48:54 2004 @@ -1,8 +1,5 @@ ;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- -;(declaim (optimize (debug 2) (speed 1) (safety 1) (compilation-speed 1))) -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) - (operate 'load-op :asdf-aclproj) (use-package :asdf-aclproj)

1 0

[cells-cvs] CVS update: cell-cultures/asdf-aclproj/asdf-aclproj.lisp
by Thomas F. Burdick 01 Jul '04

01 Jul '04

Update of /project/cells/cvsroot/cell-cultures/asdf-aclproj In directory common-lisp.net:/tmp/cvs-serv23904/asdf-aclproj Modified Files: asdf-aclproj.lisp Log Message: Last fixes, Cells-2 works in SBCL and CMUCL now. Date: Wed Jun 30 20:48:54 2004 Author: tburdick Index: cell-cultures/asdf-aclproj/asdf-aclproj.lisp diff -u cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.2 cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.3 --- cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.2 Wed Jun 30 14:02:47 2004 +++ cell-cultures/asdf-aclproj/asdf-aclproj.lisp Wed Jun 30 20:48:54 2004 @@ -31,7 +31,10 @@ (defpackage :asdf-aclproj-user (:use :cl) (:import-from :asdf-aclproj - define-project project module project-module)) + asdf-aclproj::define-project + asdf-aclproj::project + asdf-aclproj::module + asdf-aclproj::project-module)) ;;; ;;; Classes for ASDF @@ -155,10 +158,11 @@ (loop with so-far = () for component in list for depends-on = (reverse so-far) - do (setf (slot-value component 'asdf::in-order-to) + do (setf (slot-value component 'asdf::do-first) + `((asdf:compile-op (asdf:load-op ,@depends-on))) + (slot-value component 'asdf::in-order-to) `((asdf:load-op (asdf:load-op ,@depends-on)) - (asdf:compile-op (asdf:load-op ,@depends-on) - (asdf:compile-op ,@depends-on)))) + (asdf:compile-op (asdf:compile-op ,@depends-on)))) (push component so-far) finally (return (reverse so-far))))) (setf *project-modules*

1 0

[cells-cvs] CVS update: cell-cultures/asdf-aclproj/asdf-aclproj.lisp
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/asdf-aclproj In directory common-lisp.net:/tmp/cvs-serv10030/asdf-aclproj Modified Files: asdf-aclproj.lisp Log Message: Date: Wed Jun 30 14:02:47 2004 Author: tburdick Index: cell-cultures/asdf-aclproj/asdf-aclproj.lisp diff -u cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.1 cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.2 --- cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.1 Tue Jun 29 01:58:48 2004 +++ cell-cultures/asdf-aclproj/asdf-aclproj.lisp Wed Jun 30 14:02:47 2004 @@ -48,12 +48,6 @@ (defmethod asdf:module-components ((project lpr-project-file)) (project-modules project)) -#+(or) -(defmethod asdf:perform :before (operation (project lpr-project-file)) - (unless (asdf:module-components project) - (setf (asdf:module-components project) - (project-modules project)))) - ;;;; For use in .lpr files (defclass lpr-component () ()) @@ -61,8 +55,9 @@ (defclass project-module (lpr-component lpr-project-file) ()) ;; Because we allow goofy names like ../foo/bar.lisp, we want to return the -;; truename of the pathname, if it exists, so children will be merged -;; correctly. +;; truename of the pathname, if it exists, so children will be merged correctly. +;; I think this is a workaround for a bug in SBCL's pathname merging, but the +;; bug could be in my understanding of CL pathnames -tfb (defmethod asdf:component-pathname ((component lpr-component)) (let ((path (call-next-method))) (or (probe-file path) path))) @@ -125,8 +120,8 @@ (apply #'call-next-method component args))) (defun ensure-cgu-package () - #+(and acl mswindows) - (progn (aclwin-warning) (return-from ensure-cgu-package)) + #+(and acl mswindows) (progn (aclwin-warning) + (return-from ensure-cgu-package)) (unless (find-package "COMMON-GRAPHICS-USER") (let ((user-package (find-package "ASDF-ACLPROJ-USER"))) (assert (not (null user-package))) @@ -162,7 +157,8 @@ for depends-on = (reverse so-far) do (setf (slot-value component 'asdf::in-order-to) `((asdf:load-op (asdf:load-op ,@depends-on)) - (asdf:compile-op (asdf:compile-op ,@depends-on)))) + (asdf:compile-op (asdf:load-op ,@depends-on) + (asdf:compile-op ,@depends-on)))) (push component so-far) finally (return (reverse so-far))))) (setf *project-modules*

1 0

[cells-cvs] CVS update: cell-cultures/cells/defpackage.lisp
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv10030/cells Modified Files: defpackage.lisp Log Message: Date: Wed Jun 30 14:02:47 2004 Author: tburdick Index: cell-cultures/cells/defpackage.lisp diff -u cell-cultures/cells/defpackage.lisp:1.2 cell-cultures/cells/defpackage.lisp:1.3 --- cell-cultures/cells/defpackage.lisp:1.2 Tue Jun 29 01:58:49 2004 +++ cell-cultures/cells/defpackage.lisp Wed Jun 30 14:02:47 2004 @@ -23,17 +23,22 @@ (in-package :common-lisp-user) (defpackage :cells - (:use #:common-lisp - #:utils-kt - #+allegro #:excl - #-(or cormanlisp cmu sbcl) #:clos - #+sbcl #:sb-mop + (:use #:common-lisp #:utils-kt) + (:import-from + ;; MOP + #+allegro #:excl + #+clisp #:clos + #+cmu #:mop + #+lispworks #:clos #+mcl #:ccl + #+sbcl #:sb-mop + #-(or allegro clisp cmu lispworks mcl sbcl) + (cerror "Provide a package name." + "Don't know how to find the MOP package for this Lisp.") + + #:class-precedence-list #:class-slots #:slot-definition-name ) - #+clisp (:import-from #:clos #:class-slots #:class-precedence-list) - #+cmu (:import-from #:pcl #:class-precedence-list #:class-slots - #:slot-definition-name #:true) - #+lispworks (:import-from #:lw #:true) + (:export #:cell #:c-input #:c-in #:c-in8 #:c? #:c?8 #:c?_ #:c?? #:with-integrity #:with-deference #:without-c-dependency #:self #:.cache #:c-lambda #:.cause @@ -49,4 +54,3 @@ ) #+allegro (:shadowing-import-from #:excl #:fasl-write #:fasl-read #:gc) ) -

1 0

[cells-cvs] CVS update: cell-cultures/utils-kt/defpackage.lisp
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/utils-kt In directory common-lisp.net:/tmp/cvs-serv7072/utils-kt Modified Files: defpackage.lisp Log Message: Date: Wed Jun 30 14:02:12 2004 Author: tburdick Index: cell-cultures/utils-kt/defpackage.lisp diff -u cell-cultures/utils-kt/defpackage.lisp:1.2 cell-cultures/utils-kt/defpackage.lisp:1.3 --- cell-cultures/utils-kt/defpackage.lisp:1.2 Tue Jun 29 01:58:49 2004 +++ cell-cultures/utils-kt/defpackage.lisp Wed Jun 30 14:02:12 2004 @@ -20,16 +20,13 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. +(in-package :cl-user) + (defpackage :utils-kt - (:use #:common-lisp - #-(or cormanlisp cmu sbcl) #:clos - #+sbcl #:sb-mop - #+mcl #:ccl) + (:use #:common-lisp) (:export #:eko #:eko-if #:count-it #:trc #:maptimes #:bwhen #:bif #:xor "WITH-DYNAMIC-FN" #:last1 #:packed-flat! #:with-metrics "TRUE" "SHORTC" #:intern$ #:defconstant-once "*COUNT*" "*STOP*" "*DBG*" "*TRCDEPTH*" #:make-fifo-queue #:fifo-add #:fifo-empty #:fifo-pop #:mapfifo)) - -(in-package :utils-kt)

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells-test.asd
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv19449/cells Modified Files: cells-test.asd Log Message: Fixes from porting to CMUCL: * Fixed a serialization bug in asdf-aclproj. * Cleaned up defpackage forms. * Loading cells-test with asdf now runs the tests in an :after method. Date: Wed Jun 30 13:56:36 2004 Author: tburdick Index: cell-cultures/cells/cells-test.asd diff -u cell-cultures/cells/cells-test.asd:1.1 cell-cultures/cells/cells-test.asd:1.2 --- cell-cultures/cells/cells-test.asd:1.1 Tue Jun 29 18:08:33 2004 +++ cell-cultures/cells/cells-test.asd Wed Jun 30 13:56:36 2004 @@ -18,3 +18,6 @@ :long-description "Informatively-commented regression tests for Cells" :serial t :components ((lpr-project-file "cells-test"))) + +(defmethod perform :after ((op load-op) (system (eql (find-system :cells-test)))) + (cells::cv-test)) \ No newline at end of file

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells-test/cells-test.asd
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/cells/cells-test In directory common-lisp.net:/tmp/cvs-serv26932/cells/cells-test Removed Files: cells-test.asd Log Message: Moved some things around, added installation instructions. Date: Tue Jun 29 18:08:33 2004 Author: tburdick

1 0