From b3fc00f4e9cba016330a3b25f3ee5c6c933b25b0 Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Fri, 29 Dec 2006 22:06:44 +0000 Subject: [PATCH] Remove outdated system file and BUILD-script. Update INSTALL accordingly. --- BUILD | 112 ----------------------- INSTALL | 13 +-- closure.system | 280 --------------------------------------------------------- 3 files changed, 8 insertions(+), 397 deletions(-) delete mode 100755 BUILD delete mode 100644 closure.system diff --git a/BUILD b/BUILD deleted file mode 100755 index 36c09c4..0000000 --- a/BUILD +++ /dev/null @@ -1,112 +0,0 @@ -#! /bin/sh -lisp << EOF -(in-package :cl-user) - -;;(gc-off) - -(setf *print-case* :upcase) - -(setf *features* (delete :no-clx *features* :test #'eq)) - -(or - (ignore-errors (require :clx)) - (ignore-errors (require :cmucl-clx))) - -(unless (member :clx *features*) - (error "CLX was not loaded successfully.")) - -(ignore-errors (require :gray-streams)) - -(unless (find-class 'ext::fundamental-stream) - (error "The graystreams was not loaded successfully.")) - -;; Switch off bullshit -(setf *TOP-LEVEL-AUTO-DECLARE* nil) -(setf *GC-VERBOSE* nil) -(setf *LOAD-VERBOSE* nil) -(setf *LOAD-PRINT* nil) - -;;;; -------------------------------------------------------------------------------- - -;;;; fixes - -;; -;; SIGINTs are now delivered to the "main thread" -;; - -(in-package "MULTIPROCESSING") - -(defvar *top-level-loop* nil) - -(defun startup-idle-and-top-level-loops () - "Enter the idle loop, starting a new process to run the top level loop. - The awaking of sleeping processes is timed better with the idle loop process - running, and starting a new process for the top level loop supports a - simultaneous interactive session. Such an initialisation will likely be the - default when there is better MP debug support etc." - (assert (eq *current-process* *initial-process*) () - "Only the *initial-process* is intended to run the idle loop") - (init-multi-processing) ; Initialise in case MP had been shutdown. - ;; Start a new Top Level loop. - (setq *top-level-loop* - (make-process #'top-level :name "Top Level Loop") ) - ;; start the listener - (ignore-errors (eval (read-from-string "(telnet::start :port 60666)"))) - - ;; Enter the idle loop. - (idle-process-loop)) - -(in-package "UNIX") - -(defun my-sigint-handler (signal code scp) - (declare (ignore signal code) - (type system-area-pointer scp) - (optimize (inhibit-warnings 3))) - (if mp::*top-level-loop* - (let ((adr (with-alien ((scp (* sigcontext) scp)) - (sap-int (vm:sigcontext-program-counter scp))))) - (mp:process-interrupt mp::*top-level-loop* - (lambda () - (break "Interrupted at #x~x." - adr)))) - (break "Interrupted at #x~x." adr))) - -(setf ext:*after-save-initializations* - (append ext:*after-save-initializations* - (list (lambda () - (enable-interrupt :sigint #'my-sigint-handler)) - ;; mp::start-sigalrm-yield -- not reliable enough :-( - ))) - -(in-package "CL-USER") - - -;;;; -------------------------------------------------------------------------------- - -(load "closure.system") - -(oos :clim :compile) -(oos :clim-clx :compile) -(oos :closure :compile) - -(setf ext:*herald-items* - (list* :clim (list (format nil " Closure (loaded ~D-~2,'0D-~2,'0D)" - (nth-value 5 (decode-universal-time (get-universal-time))) - (nth-value 4 (decode-universal-time (get-universal-time))) - (nth-value 3 (decode-universal-time (get-universal-time))))) - ext:*herald-items*)) - -;;;; Dump - -;; Enable the garbage collector. But first fake it into thinking that -;; we don't need to garbage collect. The save-lisp is going to call -;; purify so any garbage will be collected then. -(setf lisp::*need-to-collect-garbage* nil) -;; (ext:gc-on) -;; -;; Save the lisp. -(setf lisp::*internal-real-time-base-seconds* nil) -(ext:save-lisp "lisp.core" - :init-function 'mp::startup-idle-and-top-level-loops) -(ext:quit) -EOF diff --git a/INSTALL b/INSTALL index 1613851..269e609 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ Preliminary Installation Instructions Provide yourself with: - 1. CMUCL + 1. CMUCL, SBCL, or another supported implementation [For what it is worth, I use 18d-pre] @@ -14,13 +14,16 @@ Provide yourself with: [Debian package gif2png] + 4. McCLIM, Closure XML, and their dependencies -There is a script named BUILD. After executing it, if you are lucky -this will leave you with a lisp.core which contains closure. + [ http://common-lisp.net/project/mcclim/ + http://common-lisp.net/project/cxml/ ] -Fire up the the newly build core: -$ lisp -core lisp.core +Compile closure using ASDF: Register closure.asd in your central +registry and run: + +* (asdf:operate 'asdf:load-op :closure) Then start Closure: diff --git a/closure.system b/closure.system deleted file mode 100644 index 759fdbb..0000000 --- a/closure.system +++ /dev/null @@ -1,280 +0,0 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CL-USER; Encoding: utf-8; -*- - -;; commit test - -(in-package :common-lisp-user) - -;;; Random early Lisp Implementation-specific fix ups: - -#+EXCL -(progn - (require :clx) - ;(load "~/../gilbert-neu/lisp/clx-acl/macros.cl") - ;(load "~/../gilbert-neu/lisp/clx-acl/bufmac.cl") - (unuse-package :excl) - ;;(load "~/lisp/defsystem/defsystem.lisp") - ) -#+EXCL -(progn - (setq mk::*bother-user-if-no-binary* nil) - (setq mk::*compile-during-load* t) ) - -#+CMU -(setq ext:*GC-VERBOSE* nil) ;das merk ich schon selbst. - -;;;; Try to find defsystem -#-MK-DEFSYSTEM -(or - (ignore-errors (load "library:subsystems/defsystem")) - (load (compile-file (merge-pathnames "other/defsystem/defsystem.lisp")))) - -(eval-when (compile eval load) - (pushnew :DEBUG-CLOSURE *features*)) - -;;;; -;;;; Optimization levels: -;;;; - -;; FIXME: This is not exactly the right place! - -;; We choose to make them constants for read-time evaluation, since we -;; want the presence of the :DEBUG-CLOSURE feature to override any -;; (saftey 0) declaration. - -(defparameter +optimize-very-fast+ - '(optimize (safety #.(or #+:DEBUG-CLOSURE 3 0)) (speed 3) #+:DEBUG-CLOSURE (debug 3))) - -(defparameter +optimize-very-fast-trusted+ - '(optimize (safety #.(or #+:DEBUG-CLOSURE 3 0)) (speed 3) #+:DEBUG-CLOSURE (debug 3))) - -(defparameter +optimize-fast+ - '(optimize (safety #.(or #+:DEBUG-CLOSURE 3 1)) (speed 3) #+:DEBUG-CLOSURE (debug 3))) - -(defparameter +optimize-normal+ - '(optimize (safety #.(or #+:DEBUG-CLOSURE 3 2)) (speed 1) #+:DEBUG-CLOSURE (debug 3))) - -(export '+optimize-very-fast-trusted+) -(export '+optimize-very-fast+) -(export '+optimize-fast+) -(export '+optimize-normal+) - -;; Finally declaim normal optimization level -(declaim #.+optimize-normal+) - -;;(load (merge-pathnames "glisp.system" *load-pathname*)) -;;(load (merge-pathnames "graphics-utilities.system" *load-pathname*)) - -;;; - -(eval-when (compile eval load) - (defun rel-path (&rest components) - (print (merge-pathnames (make-pathname :name nil :type nil - :directory (cons :relative components)) - (make-pathname :name nil :type nil - :defaults - (truename *load-pathname*)))))) - -;; Make this build with the CVS tree also ... -(ignore-errors - (load (merge-pathnames "system.lisp" (rel-path "other" "mcclim")))) - -(mk:defsystem glisp - :source-pathname #.(rel-path "src" "glisp") - :initially-do (progn - (defpackage :glisp (:use)) - #+EXCL (setq comp:*cltl1-compile-file-toplevel-compatibility-p* t) - ) - :finally-do (progn - #+EXCL (setq comp:*cltl1-compile-file-toplevel-compatibility-p* nil)) - - :components - ((:file dependent - :source-pathname - #+CLISP "dep-clisp" - #+(AND :CMU (NOT :PTHREAD)) "dep-cmucl" - #+(AND :CMU :PTHREAD) "dep-cmucl-dtc" - #+(AND ALLEGRO ALLEGRO-V5.0) "dep-acl5" - #+(AND ALLEGRO (NOT ALLEGRO-V5.0)) "dep-acl" - #+GCL "dep-gcl" - #+OPENMCL "dep-openmcl" - #-(OR OPENMCL CLISP CMU ALLEGRO GCL) #.(error "Configure!")) - (:file "package" - :depends-on (dependent)) - (:file "runes" - :depends-on ("package" dependent)) - (:file "util" - :depends-on ("package" dependent "runes")) - (:file "match" - :depends-on ("package" dependent "runes" "util")) )) - - -(mk:defsystem closure - :source-pathname (make-pathname :name nil :type nil - :defaults *load-truename*) - :source-extension "lisp" - :depends-on (:clx - :clim - :clim-clx - :glisp) - :components - ( - (:module src - :source-pathname "src" - :components - ( - ;;; Patches - - (:module patches - :source-pathname "patches" - :components - (:serial "clx-patch")) - - ;;; Images - - (:module imagelib - :source-pathname "imagelib" - :components - (:serial - "package" - "basic" - "deflate" - "png")) - - ;;; Early package definitions - - (:file "defpack") - - ;;; Clousure Protocol Declarations first - - (:module closure-protcols - :source-pathname "protocols" - :components - ((:file "package") - (:file "element") - (:file "css-support"))) - - ;;; Libraries - - (:module xml - :source-pathname "xml" - :components - ((:file "package") - (:file "encodings" :depends-on ("package")) - (:file "encodings-data" :depends-on ("package" "encodings")) - #+NIL(:file "dompack") - #+NIL(:file "dom-impl" :depends-on ("dompack")) - (:file "xml-stream" :depends-on ("package")) - #+NIL (:file "xml-name-rune-p" :depends-on ("package")) - #+NIL(:file "xml-parse" :depends-on ("package" "dompack")) - #+NIL(:file "xml-canonic" :depends-on ("package" "dompack" "xml-parse")) )) - - ;;; CLEX and LALR - - (:module clex - :source-pathname "util" - :components - ((:file "clex") )) - - (:module lalr - :source-pathname "util" - :components - ((:file "lalr") )) - - ;;; Networking stuff - - (:module netlib - :source-pathname "net" - :components - ((:file "package" :depends-on ("url")) - (:file "common-parse" :depends-on ("package")) - (:file "mime" :depends-on ("package")) - (:file "url" :depends-on ()) - (:file "http" :depends-on ("package" "url")) - (:file "ftp" :depends-on ("package" "url")) )) - - ;;; The HTML parser - - (:module sgml-parse - :source-pathname "parse" - :components - ((:file "package") - (:file "pt" :depends-on ("package")) - (:file "sgml-dtd" :depends-on ("package")) - (:file "sgml-parse" :depends-on ("package" "sgml-dtd")) )) - - ;;; More Random Utilities - - (:module util - :source-pathname "util" - :components - (:parallel "character-set" - "xterm")) - - ;;; CSS - - (:module css - :source-pathname "css" - :components - (:serial - "package" - "css-support" - "css-parse" - "css-selector" - "css-setup" - "css-properties")) - - ;;; Renderer - - (:module renderer - :source-pathname "renderer" - :components - (:serial - "package" - - "device" ;Declaration of the device abstraction - "fonts" ;Font Databases - - "texpara" - "images" - "x11" - "r-struct" - "document" - "raux" - "renderer" - "hyphenation" ;Hyphenation of words - "clim-draw" ;some drawing "primitives" for the clim device - "renderer2" - "list-item" - ; "tables" - "clim-device")) - - ;;; HTML - - (:module html - :source-pathname "html" - :components - (:serial - "html-style")) - - ;;; GUI - - (:module gui - :source-pathname "gui" - :components - (:serial - "gui" "clue-gui" "dce-and-pce" "clue-input" - ;; - "clim-gui") ) - - ;;; Patches - - (:file "patch") - )) - - ;;; Some resources - - (:module resources - :source-pathname "resources" - :components - (:serial - "resources.lisp")) )) -- 2.11.4.GIT