[mcclim-cvs] CVS mcclim

afuchs afuchs at common-lisp.net
Thu Jan 18 15:01:11 UTC 2007


Update of /project/mcclim/cvsroot/mcclim
In directory clnet:/tmp/cvs-serv17193

Modified Files:
	NEWS mcclim.asd 
Added Files:
	clim-examples.asd clim-listener.asd clouseau.asd scigraph.asd 
	symlink-asd-files.sh 
Log Message:
Split the interesting systems from mcclim.asd into their own .asd
files, to ease asdf-installation.

Beware: If you had symlinks from e.g. /path/to/asdf-central-registry/clim-listener.asd to mcclim.asd, this will break your setup. Run
        ./symlink-asd-files.sh /path/to/asdf-central-registry/
to fix this.


--- /project/mcclim/cvsroot/mcclim/NEWS	2007/01/14 07:59:03	1.19
+++ /project/mcclim/cvsroot/mcclim/NEWS	2007/01/18 15:01:11	1.20
@@ -1,3 +1,8 @@
+* Changes in mcclim-0.9.5 relative to 0.9.4:
+** Installation: the systems clim-listener, scigraph, clim-examples,
+   and clouseau can now be loaded without loading the system mcclim
+   first.
+
 * Changes in mcclim-0.9.4 relative to 0.9.3:
 ** cleanup: removed the obsolete system.lisp file.
 ** backend improvements: Gtkairo
--- /project/mcclim/cvsroot/mcclim/mcclim.asd	2007/01/15 11:35:55	1.52
+++ /project/mcclim/cvsroot/mcclim/mcclim.asd	2007/01/18 15:01:11	1.53
@@ -441,123 +441,12 @@
 		 (:file "Looks/pixie"
                         :pathname #.(make-pathname :directory '(:relative "Looks") :name "pixie" :type "lisp"))))
 
-;;; name of :clim-clx-user chosen by mikemac for no good reason
-(defsystem :clim-clx-user
-    :depends-on (:clim :clim-clx))
-
 ;;; The actual McCLIM system that people should to use in their ASDF
 ;;; package dependency lists.
 (defsystem :mcclim
-    :version "0.9.4"
+    :version "0.9.5-dev"
     :depends-on (:clim-looks))
 
-;;; CLIM-Examples depends on having at least one backend loaded.
-(defsystem :clim-examples
-    :depends-on (:mcclim)
-    :components
-    ((:module "Examples"
-              :components
-              ((:file "calculator")
-               (:file "colorslider")
-	       (:file "menutest") ; extra
-               (:file "address-book")
-               (:file "traffic-lights")
-               (:file "clim-fig")
-               (:file "postscript-test")
-               (:file "puzzle")
-               (:file "transformations-test")
-	       (:file "demodemo")
-               (:file "stream-test")
-               (:file "presentation-test")
-               (:file "dragndrop")
-	       (:file "gadget-test")
-               (:file "accepting-values")
-               (:file "method-browser")
-	       (:file "stopwatch")
-	       (:file "dragndrop-translator")
-               (:file "draggable-graph")
-               (:file "text-size-test")
-               (:file "drawing-benchmark")
-               (:file "logic-cube")
-               (:file "views")
-               (:file "font-selector")))
-     (:module "Goatee"
-	      :components
-	      ((:file "goatee-test")))))
-
-;;; This won't load in SBCL, either. I have really crappy code to
-;;; extract dependency information from :serial t ASDF systems, but
-;;; this comment is too narrow to contain it.
-(clim-defsystem (:scigraph :depends-on (:mcclim))
-  ;; The DWIM part of SCIGRAPH		
-  "Apps/Scigraph/dwim/package"
-  "Apps/Scigraph/dwim/feature-case"
-  "Apps/Scigraph/dwim/macros"
-  "Apps/Scigraph/dwim/tv"
-  "Apps/Scigraph/dwim/draw"
-  "Apps/Scigraph/dwim/present"
-  "Apps/Scigraph/dwim/extensions"
-  "Apps/Scigraph/dwim/wholine"
-  "Apps/Scigraph/dwim/export"
-  ;; The Scigraph part
-  "Apps/Scigraph/scigraph/package" 
-  "Apps/Scigraph/scigraph/copy"
-  "Apps/Scigraph/scigraph/dump"
-  "Apps/Scigraph/scigraph/duplicate"
-  "Apps/Scigraph/scigraph/random"
-  "Apps/Scigraph/scigraph/menu-tools"
-  "Apps/Scigraph/scigraph/basic-classes"
-  "Apps/Scigraph/scigraph/draw"
-  "Apps/Scigraph/scigraph/mouse"
-  "Apps/Scigraph/scigraph/color"
-  "Apps/Scigraph/scigraph/basic-graph"
-  "Apps/Scigraph/scigraph/graph-mixins"
-  "Apps/Scigraph/scigraph/axis"
-  "Apps/Scigraph/scigraph/moving-object"
-  "Apps/Scigraph/scigraph/symbol"
-  "Apps/Scigraph/scigraph/graph-data"
-  "Apps/Scigraph/scigraph/legend"
-  "Apps/Scigraph/scigraph/graph-classes"
-  "Apps/Scigraph/scigraph/present"
-  "Apps/Scigraph/scigraph/annotations"
-  "Apps/Scigraph/scigraph/annotated-graph"
-  "Apps/Scigraph/scigraph/contour"
-  "Apps/Scigraph/scigraph/equation"
-  "Apps/Scigraph/scigraph/popup-accept"
-  "Apps/Scigraph/scigraph/popup-accept-methods"
-  "Apps/Scigraph/scigraph/duplicate-methods"
-  "Apps/Scigraph/scigraph/frame"
-  "Apps/Scigraph/scigraph/export"
-  "Apps/Scigraph/scigraph/demo-frame")
-
-(defsystem :clim-listener
-    :depends-on (:mcclim #+sbcl :sb-posix)
-    :components
-    ((:file "Experimental/xpm"
-            :pathname #.(make-pathname :directory '(:relative "Experimental") :name "xpm" :type "lisp"))
-     (:module "Apps/Listener"
-              :pathname #.(make-pathname :directory '(:relative "Apps" "Listener"))
-              :depends-on ("Experimental/xpm")
-              :components
-              ((:file "package")
-               (:file "util" :depends-on ("package"))
-               (:file "icons" :depends-on ("package" "util"))
-               (:file "file-types" :depends-on ("package" "icons" "util"))
-               (:file "dev-commands" :depends-on ("package" "icons" "file-types" "util"))
-               (:file "listener" :depends-on ("package" "file-types" "icons" "dev-commands" "util"))
-               #+CMU (:file "cmu-hacks" :depends-on ("package"))))))
-
-(defsystem :clouseau
-    :depends-on (:mcclim)
-    :serial t
-    :components
-    ((:module "Apps/Inspector"
-              :pathname #.(make-pathname :directory '(:relative "Apps" "Inspector"))
-              :components
-	      ((:file "package")
-	       (:file "disassembly" :depends-on ("package"))
-	       (:file "inspector" :depends-on ("disassembly"))))))
-
 (defmethod perform :after ((op load-op) (c (eql (find-system :clim))))
   (pushnew :clim *features*)
   (pushnew :mcclim *features*))

--- /project/mcclim/cvsroot/mcclim/clim-examples.asd	2007/01/18 15:01:11	NONE
+++ /project/mcclim/cvsroot/mcclim/clim-examples.asd	2007/01/18 15:01:11	1.1
;;; -*- lisp -*-

(defpackage :clim-examples.system
  (:use :cl :asdf))

(in-package :clim-examples.system)

;;; CLIM-Examples depends on having at least one backend loaded.
(defsystem :clim-examples
    :depends-on (:mcclim)
    :components
    ((:module "Examples"
              :components
              ((:file "calculator")
               (:file "colorslider")
	       (:file "menutest") ; extra
               (:file "address-book")
               (:file "traffic-lights")
               (:file "clim-fig")
               (:file "postscript-test")
               (:file "puzzle")
               (:file "transformations-test")
	       (:file "demodemo")
               (:file "stream-test")
               (:file "presentation-test")
               (:file "dragndrop")
	       (:file "gadget-test")
               (:file "accepting-values")
               (:file "method-browser")
	       (:file "stopwatch")
	       (:file "dragndrop-translator")
               (:file "draggable-graph")
               (:file "text-size-test")
               (:file "drawing-benchmark")
               (:file "logic-cube")
               (:file "views")
               (:file "font-selector")))
     (:module "Goatee"
	      :components
	      ((:file "goatee-test")))))
--- /project/mcclim/cvsroot/mcclim/clim-listener.asd	2007/01/18 15:01:11	NONE
+++ /project/mcclim/cvsroot/mcclim/clim-listener.asd	2007/01/18 15:01:11	1.1
;;; -*- lisp -*-

(defpackage :clim-listener.system
  (:use :cl :asdf))

(in-package :clim-listener.system)

(defsystem :clim-listener
    :depends-on (:mcclim #+sbcl :sb-posix)
    :components
    ((:file "Experimental/xpm"
            :pathname #.(make-pathname :directory '(:relative "Experimental") :name "xpm" :type "lisp"))
     (:module "Apps/Listener"
              :pathname #.(make-pathname :directory '(:relative "Apps" "Listener"))
              :depends-on ("Experimental/xpm")
              :components
              ((:file "package")
               (:file "util" :depends-on ("package"))
               (:file "icons" :depends-on ("package" "util"))
               (:file "file-types" :depends-on ("package" "icons" "util"))
               (:file "dev-commands" :depends-on ("package" "icons" "file-types" "util"))
               (:file "listener" :depends-on ("package" "file-types" "icons" "dev-commands" "util"))
               #+CMU (:file "cmu-hacks" :depends-on ("package"))))))--- /project/mcclim/cvsroot/mcclim/clouseau.asd	2007/01/18 15:01:11	NONE
+++ /project/mcclim/cvsroot/mcclim/clouseau.asd	2007/01/18 15:01:11	1.1
;;; -*- lisp -*-

(defpackage :clouseau.system
  (:use :cl :asdf))

(in-package :clouseau.system)

(defsystem :clouseau
    :depends-on (:mcclim)
    :serial t
    :components
    ((:module "Apps/Inspector"
              :pathname #.(make-pathname :directory '(:relative "Apps" "Inspector"))
              :components
	      ((:file "package")
	       (:file "disassembly" :depends-on ("package"))
	       (:file "inspector" :depends-on ("disassembly"))))))--- /project/mcclim/cvsroot/mcclim/scigraph.asd	2007/01/18 15:01:11	NONE
+++ /project/mcclim/cvsroot/mcclim/scigraph.asd	2007/01/18 15:01:11	1.1
;;; -*- lisp -*-

(defpackage :scigraph.system
  (:use :cl :asdf))

(in-package :scigraph.system)

;;; This won't load in SBCL, either. I have really crappy code to
;;; extract dependency information from :serial t ASDF systems, but
;;; this comment is too narrow to contain it.
(defsystem :scigraph
    :depends-on (:mcclim)
    ;; The DWIM part of SCIGRAPH
    :serial t
    :components
    (
     (:file "Apps/Scigraph/dwim/package")
     (:file "Apps/Scigraph/dwim/feature-case")
     (:file "Apps/Scigraph/dwim/macros")
     (:file "Apps/Scigraph/dwim/tv")
     (:file "Apps/Scigraph/dwim/draw")
     (:file "Apps/Scigraph/dwim/present")
     (:file "Apps/Scigraph/dwim/extensions")
     (:file "Apps/Scigraph/dwim/wholine")
     (:file "Apps/Scigraph/dwim/export")
     ;; The Scigraph part
     (:file "Apps/Scigraph/scigraph/package")
     (:file "Apps/Scigraph/scigraph/copy")
     (:file "Apps/Scigraph/scigraph/dump")
     (:file "Apps/Scigraph/scigraph/duplicate")
     (:file "Apps/Scigraph/scigraph/random")
     (:file "Apps/Scigraph/scigraph/menu-tools")
     (:file "Apps/Scigraph/scigraph/basic-classes")
     (:file "Apps/Scigraph/scigraph/draw")
     (:file "Apps/Scigraph/scigraph/mouse")
     (:file "Apps/Scigraph/scigraph/color")
     (:file "Apps/Scigraph/scigraph/basic-graph")
     (:file "Apps/Scigraph/scigraph/graph-mixins")
     (:file "Apps/Scigraph/scigraph/axis")
     (:file "Apps/Scigraph/scigraph/moving-object")
     (:file "Apps/Scigraph/scigraph/symbol")
     (:file "Apps/Scigraph/scigraph/graph-data")
     (:file "Apps/Scigraph/scigraph/legend")
     (:file "Apps/Scigraph/scigraph/graph-classes")
     (:file "Apps/Scigraph/scigraph/present")
     (:file "Apps/Scigraph/scigraph/annotations")
     (:file "Apps/Scigraph/scigraph/annotated-graph")
     (:file "Apps/Scigraph/scigraph/contour")
     (:file "Apps/Scigraph/scigraph/equation")
     (:file "Apps/Scigraph/scigraph/popup-accept")
     (:file "Apps/Scigraph/scigraph/popup-accept-methods")
     (:file "Apps/Scigraph/scigraph/duplicate-methods")
     (:file "Apps/Scigraph/scigraph/frame")
     (:file "Apps/Scigraph/scigraph/export")
     (:file "Apps/Scigraph/scigraph/demo-frame")))--- /project/mcclim/cvsroot/mcclim/symlink-asd-files.sh	2007/01/18 15:01:11	NONE
+++ /project/mcclim/cvsroot/mcclim/symlink-asd-files.sh	2007/01/18 15:01:11	1.1
#!/bin/sh -e

# (Re-)Installs the top-level .asd files into an
# asdf:*central-registry* directory. Prompts before overwriting
# anything.

CENTRAL_REG="$1"

if [ -z "$CENTRAL_REG" ] ; then
    echo "USAGE: $0 central-registry-dir" 2>&1
    echo "	central-registry-dir is a directory where asdf looks for .asd files." 2>&1
    echo "	e.g. on SBCL, this could be ~/.sbcl/systems/" 2>&1
    exit 1
fi

cd "`dirname $0`"
for i in *.asd ; do
    if [ -e "$CENTRAL_REG"/"$i" ]; then
        echo -en "Warning: overwriting $CENTRAL_REG/$i with link to \n`pwd`/$i (press RET to continue)" 2>&1
        read
    fi
    ln -sf "`pwd`/$i" "$CENTRAL_REG"/"$i"
done



More information about the Mcclim-cvs mailing list