[Phemlock-cvs] CVS update: phemlock/INSTALL phemlock/hemlock.asd phemlock/hemlock.system
Aleksandar Bakic
abakic at common-lisp.net
Fri Sep 3 23:06:48 UTC 2004
Update of /project/phemlock/cvsroot/phemlock
In directory common-lisp.net:/tmp/cvs-serv4954
Modified Files:
INSTALL hemlock.asd hemlock.system
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.
Date: Sat Sep 4 01:06:43 2004
Author: abakic
Index: phemlock/INSTALL
diff -u phemlock/INSTALL:1.2 phemlock/INSTALL:1.3
--- phemlock/INSTALL:1.2 Fri Jul 9 17:07:09 2004
+++ phemlock/INSTALL Sat Sep 4 01:06:43 2004
@@ -19,3 +19,4 @@
- CLISP using MIT CLX
+ASDF system file hemlock.asd has been added, supporting SBCL for now.
\ No newline at end of file
Index: phemlock/hemlock.asd
diff -u phemlock/hemlock.asd:1.1 phemlock/hemlock.asd:1.2
--- phemlock/hemlock.asd:1.1 Tue Jul 20 01:50:26 2004
+++ phemlock/hemlock.asd Sat Sep 4 01:06:43 2004
@@ -1,23 +1,233 @@
-(defpackage "MK" (:export "DEFSYSTEM"))
-(defpackage :hemlock-system (:use "CL" "ASDF"))
-(in-package :hemlock-system)
-
-(with-open-file (in (merge-pathnames "hemlock.system" *load-truename*))
- (loop for form = (read in nil nil)
- while form
- if (eql (car form) 'mk::defsystem)
- do (destructuring-bind (name &key components &allow-other-keys)
- (cdr form)
- (eval `(asdf:defsystem ,name :serial t :depends-on (clx)
- :components
- ,(mapcar (lambda (x) `(:file ,x
- :pathname
- ,(merge-pathnames
- (make-pathname
- :name x
- :directory '(:relative "src")
- :type "lisp")
- *load-truename*)))
+;; -*- Mode: Lisp; -*-
- components))))
- else do (eval form)))
+(proclaim '(optimize (safety 3) (speed 0) (debug 3)))
+
+(defpackage #:hemlock-system
+ (:use #:cl)
+ (:export #:*hemlock-base-directory*))
+
+(in-package #:hemlock-system)
+
+(pushnew :command-bits *features*)
+(pushnew :buffered-lines *features*)
+
+(defparameter *hemlock-base-directory*
+ (make-pathname :name nil :type nil :version nil
+ :defaults (parse-namestring *load-truename*)))
+
+(defparameter *binary-pathname*
+ (make-pathname :directory
+ (append (pathname-directory *hemlock-base-directory*)
+ (list "bin"
+ #+CLISP "clisp"
+ #+CMU "cmu"
+ #+EXCL "acl"
+ #+SBCL "sbcl"
+ #-(or CLISP CMU EXCL SBCL)
+ (string-downcase (lisp-implementation-type))))
+ :defaults *hemlock-base-directory*))
+
+#-CMU
+(asdf:defsystem :hemlock
+ :pathname #.(make-pathname
+ :directory
+ (append (pathname-directory *hemlock-base-directory*)
+ (list "src"))
+ :defaults *hemlock-base-directory*)
+;; :source-extension "lisp"
+;; :binary-pathname #.*binary-pathname*
+;; :depends-on (:clim-clx #+NIL :mcclim-freetype)
+;; ;; ehem ..
+;; :initially-do
+;; (progn
+;; ;; try to load clx
+;; (unless (ignore-errors (fboundp (find-symbol "OPEN-DISPLAY" "XLIB")))
+;; (ignore-errors (require :clx))
+;; (ignore-errors (require :cmucl-clx)))
+;; (unless (ignore-errors (fboundp (find-symbol "OPEN-DISPLAY" "XLIB")))
+;; (error "Please provide me with CLX."))
+;; ;; Create binary pathnames
+;; (ensure-directories-exist *binary-pathname*)
+;; (dolist (subdir '("tty" "wire" "user" "core" "clim"))
+;; (ensure-directories-exist
+;; (merge-pathnames (make-pathname :directory (list :relative subdir))
+;; *binary-pathname*)
+;; :verbose t))
+;; ;; Gray Streams
+;; #+CMU
+;; (require :gray-streams)
+;; #+CMU
+;; (setf ext:*efficiency-note-cost-threshold* most-positive-fixnum)
+;; #+CMU
+;; (setf ext:*efficiency-note-limit* 0)
+;; #+CMU
+;; (proclaim '(optimize (c::brevity 3)))
+;; #+CMU
+;; (setf c:*record-xref-info* t)
+;; )
+ :components
+ ((:module core-1
+ :pathname #.(merge-pathnames
+ (make-pathname
+ :directory '(:relative "src" "core")))
+ :components
+ ((:file "package")
+ ;; Lisp implementation specific stuff goes into one of the next
+ ;; two files.
+ (:file "lispdep")
+ (:file "hemlock-ext")
+
+ (:file "decls") ; early declarations of functions and stuff
+ (:file "struct")
+ ;; "struct-ed"
+ (:file "charmacs")
+ (:file "key-event")))
+ (:module bitmap-1
+ :pathname #.(merge-pathnames
+ (make-pathname
+ :directory '(:relative "src" "bitmap")))
+ :depends-on (core-1)
+ :components
+ ((:file "keysym-defs") ; hmm.
+ (:file "bit-stuff") ; input depends on it --amb
+ (:file "hunk-draw"))) ; window depends on it --amb
+ (:module core-2
+ :pathname #.(merge-pathnames
+ (make-pathname
+ :directory '(:relative "src" "core")))
+ :depends-on (bitmap-1)
+ :components
+ ((:file "rompsite")
+ (:file "input")
+ (:file "macros")
+ (:file "line")
+ (:file "ring")
+ (:file "htext1") ; buffer depends on it --amb
+ (:file "buffer")
+ (:file "vars")
+ (:file "interp")
+ (:file "syntax")
+ (:file "htext2")
+ (:file "htext3")
+ (:file "htext4")
+ (:file "files")
+ (:file "search1")
+ (:file "search2")
+ (:file "table")
+
+ (:file "winimage")
+ (:file "window")
+ (:file "screen")
+ (:file "linimage")
+ (:file "cursor")
+ (:file "display")))
+;;; (:module tty-1
+;;; :source-pathname "tty"
+;;; :components
+;;; ("termcap"
+;;; ;; "tty-disp-rt"
+;;; ;; "tty-display"
+;;; ))
+ (:module root-1
+ :pathname #.(merge-pathnames
+ (make-pathname
+ :directory '(:relative "src")))
+ :depends-on (core-2)
+ :components
+ ((:file "pop-up-stream")))
+;;; (:module tty-2
+;;; :source-pathname "tty"
+;;; :components
+;;; ("tty-screen"))
+ (:module root-2
+ :pathname #.(merge-pathnames
+ (make-pathname
+ :directory '(:relative "src")))
+ :depends-on (root-1)
+ :components
+ ((:file "font")
+ (:file "streams")
+ ;; "hacks"
+ (:file "main")
+ (:file "echo")))
+ (:module user-1
+ :pathname #.(merge-pathnames
+ (make-pathname
+ :directory '(:relative "src" "user")))
+ :depends-on (root-2)
+ :components
+ ((:file "echocoms")
+
+ (:file "command")
+ (:file "kbdmac")
+ (:file "undo")
+ (:file "killcoms")
+ (:file "indent")
+ (:file "searchcoms")
+ (:file "filecoms")
+ (:file "morecoms")
+ (:file "doccoms")
+ (:file "srccom")
+ (:file "group")
+ (:file "fill")
+ (:file "text")
+
+ (:file "lispmode")
+ ;; "ts-buf"
+ ;; "ts-stream"
+ ;; "eval-server"
+ (:file "lispbuf")
+ ;; "lispeval"
+ ;; "spell-rt"
+ ;; "spell-corr"
+ ;; "spell-aug"
+ ;; "spellcoms"
+
+ (:file "comments")
+ (:file "overwrite")
+ (:file "abbrev")
+ (:file "icom")
+ (:file "defsyn")
+ (:file "scribe")
+ (:file "pascal")
+ (:file "dylan")
+
+ (:file "edit-defs")
+ (:file "auto-save")
+ (:file "register")
+ (:file "xcoms")
+ ;; "unixcoms"
+ ;; "mh"
+ (:file "highlight")
+ ;; "dired"
+ ;; "diredcoms"
+ (:file "bufed")
+ ;;"lisp-lib"
+ (:file "completion")
+ ;; "shell"
+ ;; "debug"
+ ;; "netnews"
+ ;; "rcs"
+ (:file "dabbrev")
+ (:file "bindings")
+ (:file "bindings-gb")))
+ (:module bitmap-2
+ :pathname #.(merge-pathnames
+ (make-pathname
+ :directory '(:relative "src" "bitmap")))
+ :depends-on (user-1)
+ :components
+ ((:file "rompsite")
+ (:file "input")
+ (:file "bit-screen")
+ (:file "bit-display")
+ (:file "pop-up-stream")))
+ (:module clim-1
+ :pathname #.(merge-pathnames
+ (make-pathname
+ :directory '(:relative "src" "clim")))
+ :depends-on (bitmap-2)
+ :components
+ ((:file "patch")
+ (:file "foo")
+ #+nilamb(:file "exp-syntax")))))
\ No newline at end of file
Index: phemlock/hemlock.system
diff -u phemlock/hemlock.system:1.2 phemlock/hemlock.system:1.3
--- phemlock/hemlock.system:1.2 Fri Jul 9 17:16:55 2004
+++ phemlock/hemlock.system Sat Sep 4 01:06:43 2004
@@ -28,10 +28,11 @@
:defaults *hemlock-base-directory*))
(mk:defsystem :hemlock
- :source-pathname #.(make-pathname :directory
- (append (pathname-directory *hemlock-base-directory*)
- (list "src"))
- :defaults *hemlock-base-directory*)
+ :source-pathname #.(make-pathname
+ :directory
+ (append (pathname-directory *hemlock-base-directory*)
+ (list "src"))
+ :defaults *hemlock-base-directory*)
:source-extension "lisp"
:binary-pathname #.*binary-pathname*
:depends-on (:clim-clx #+NIL :mcclim-freetype)
@@ -47,138 +48,169 @@
;; Create binary pathnames
(ensure-directories-exist *binary-pathname*)
(dolist (subdir '("tty" "wire" "user" "core" "clim"))
- (ensure-directories-exist (merge-pathnames (make-pathname :directory (list :relative subdir))
- *binary-pathname*)
- :verbose t))
+ (ensure-directories-exist
+ (merge-pathnames (make-pathname :directory (list :relative subdir))
+ *binary-pathname*)
+ :verbose t))
;; Gray Streams
#+CMU
(require :gray-streams)
#+CMU
- (setf *EFFICIENCY-NOTE-COST-THRESHOLD* 1000000)
+ (setf ext:*efficiency-note-cost-threshold* most-positive-fixnum)
#+CMU
- (setf *EFFICIENCY-NOTE-LIMIT* 0)
+ (setf ext:*efficiency-note-limit* 0)
#+CMU
- (setf C:*RECORD-XREF-INFO* t)
+ (proclaim '(optimize (c::brevity 3)))
+ #+CMU
+ (setf c:*record-xref-info* t)
)
:components
- ("core/package"
-
- ;; Lisp implementation specific stuff goes into one of the next
- ;; two files.
- "core/lispdep"
- "core/hemlock-ext"
-
- "core/decls" ;early declarations of functions and stuff
-
- "core/struct"
- ;; "struct-ed"
- "core/charmacs"
- "core/key-event"
- "bitmap/keysym-defs" ;hmm.
- "core/rompsite"
- "core/input"
- "core/macros"
- "core/line"
- "core/ring"
- "core/vars"
- "core/interp"
- "core/syntax"
- "core/htext1"
- "core/buffer"
- "core/htext2"
- "core/htext3"
- "core/htext4"
- "core/files"
- "core/search1"
- "core/search2"
- "core/table"
+ ((:module core-1
+ :source-pathname "core"
+ :components
+ ((:file "package")
+ ;; Lisp implementation specific stuff goes into one of the next
+ ;; two files.
+ (:file "lispdep")
+ (:file "hemlock-ext")
+
+ (:file "decls") ; early declarations of functions and stuff
+ (:file "struct")
+ ;; "struct-ed"
+ (:file "charmacs")
+ (:file "key-event")))
+ (:module bitmap-1
+ :source-pathname "bitmap"
+ :depends-on (core-1)
+ :components
+ ((:file "keysym-defs") ; hmm.
+ (:file "bit-stuff") ; input depends on it --amb
+ (:file "hunk-draw"))) ; window depends on it --amb
+ (:module core-2
+ :source-pathname "core"
+ :depends-on (bitmap-1)
+ :components
+ ((:file "rompsite")
+ (:file "input")
+ (:file "macros")
+ (:file "line")
+ (:file "ring")
+ (:file "htext1") ; buffer depends on it --amb
+ (:file "buffer")
+ (:file "vars")
+ (:file "interp")
+ (:file "syntax")
+ (:file "htext2")
+ (:file "htext3")
+ (:file "htext4")
+ (:file "files")
+ (:file "search1")
+ (:file "search2")
+ (:file "table")
-
- "core/window"
- "core/screen"
- "core/winimage"
- "core/linimage"
- "core/cursor"
- "core/display"
-
-
- "tty/termcap"
- ;"tty-disp-rt"
- ;"tty-display"
- "pop-up-stream"
- "tty/tty-screen"
-
- "font"
- "streams"
-; "hacks"
- "main"
- "echo"
- "user/echocoms"
-
- "user/command"
- "user/kbdmac"
- "user/undo"
- "user/killcoms"
- "user/indent"
- "user/searchcoms"
- "user/filecoms"
- "user/morecoms"
- "user/doccoms"
- "user/srccom"
- "user/group"
- "user/fill"
- "user/text"
-
- "user/lispmode"
-;; "user/ts-buf"
-;; "user/ts-stream"
-;; "user/eval-server"
- "user/lispbuf"
-;; "user/lispeval"
-;; "user/spell-rt"
-;; "user/spell-corr"
-;; "user/spell-aug"
-;; "user/spellcoms"
-
- "user/comments"
- "user/overwrite"
- "user/abbrev"
- "user/icom"
- "user/defsyn"
- "user/scribe"
- "user/pascal"
- "user/dylan"
-
- "user/edit-defs"
- "user/auto-save"
- "user/register"
- "user/xcoms"
-;; "user/unixcoms"
-;; "user/mh"
- "user/highlight"
-;; "user/dired"
-;; "user/diredcoms"
- "user/bufed"
-;; "user/lisp-lib"
- "user/completion"
-;; "user/shell"
-;; "user/debug"
-;; "user/netnews"
-;; "user/rcs"
- "user/dabbrev"
- "user/bindings"
- "user/bindings-gb"
-
-
- "bitmap/rompsite"
- "bitmap/input"
- "bitmap/bit-stuff"
- "bitmap/hunk-draw"
- "bitmap/bit-display"
- "bitmap/bit-screen"
- "bitmap/pop-up-stream"
-
- "clim/patch"
- "clim/foo"
- "clim/exp-syntax"
- ))
+ (:file "winimage")
+ (:file "window")
+ (:file "screen")
+ (:file "linimage")
+ (:file "cursor")
+ (:file "display")))
+;;; (:module tty-1
+;;; :source-pathname "tty"
+;;; :components
+;;; ("termcap"
+;;; ;; "tty-disp-rt"
+;;; ;; "tty-display"
+;;; ))
+ (:module root-1
+ :source-pathname ""
+ :depends-on (core-2)
+ :components
+ ((:file "pop-up-stream")))
+;;; (:module tty-2
+;;; :source-pathname "tty"
+;;; :components
+;;; ("tty-screen"))
+ (:module root-2
+ :source-pathname ""
+ :depends-on (root-1)
+ :components
+ ((:file "font")
+ (:file "streams")
+ ;; "hacks"
+ (:file "main")
+ (:file "echo")))
+ (:module user-1
+ :source-pathname "user"
+ :depends-on (root-2)
+ :components
+ ((:file "echocoms")
+
+ (:file "command")
+ (:file "kbdmac")
+ (:file "undo")
+ (:file "killcoms")
+ (:file "indent")
+ (:file "searchcoms")
+ (:file "filecoms")
+ (:file "morecoms")
+ (:file "doccoms")
+ (:file "srccom")
+ (:file "group")
+ (:file "fill")
+ (:file "text")
+
+ (:file "lispmode")
+ ;; "ts-buf"
+ ;; "ts-stream"
+ ;; "eval-server"
+ (:file "lispbuf")
+ ;; "lispeval"
+ ;; "spell-rt"
+ ;; "spell-corr"
+ ;; "spell-aug"
+ ;; "spellcoms"
+
+ (:file "comments")
+ (:file "overwrite")
+ (:file "abbrev")
+ (:file "icom")
+ (:file "defsyn")
+ (:file "scribe")
+ (:file "pascal")
+ (:file "dylan")
+
+ (:file "edit-defs")
+ (:file "auto-save")
+ (:file "register")
+ (:file "xcoms")
+ ;; "unixcoms"
+ ;; "mh"
+ (:file "highlight")
+ ;; "dired"
+ ;; "diredcoms"
+ (:file "bufed")
+ ;;"lisp-lib"
+ (:file "completion")
+ ;; "shell"
+ ;; "debug"
+ ;; "netnews"
+ ;; "rcs"
+ (:file "dabbrev")
+ (:file "bindings")
+ (:file "bindings-gb")))
+ (:module bitmap-2
+ :source-pathname "bitmap"
+ :depends-on (user-1)
+ :components
+ ((:file "rompsite")
+ (:file "input")
+ (:file "bit-screen")
+ (:file "bit-display")
+ (:file "pop-up-stream")))
+ (:module clim-1
+ :source-pathname "clim"
+ :depends-on (bitmap-2)
+ :components
+ ((:file "patch")
+ (:file "foo")
+ (:file "exp-syntax")))))
\ No newline at end of file
More information about the Phemlock-cvs
mailing list