From 38ee40e01ee5ff362fc5c5a9ed32be94a7d4bc76 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Sun, 10 Oct 2010 16:14:04 +0200 Subject: [PATCH] loader fixes and docs. Most critical was to serializt the config stuff. Gotta, gotta! Signed-off-by: AJ Rossini --- cls.asd | 20 ++++++++++++-------- src/config.lisp | 6 +++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cls.asd b/cls.asd index a694864..6cb8b55 100644 --- a/cls.asd +++ b/cls.asd @@ -1,5 +1,5 @@ ;; -*- mode: lisp -*- -;;; Time-stamp: <2010-02-13 15:24:47 tony> +;;; Time-stamp: <2010-10-10 16:04:08 tony> ;;; Created: <2005-05-30 17:09:47 blindglobe> ;;; File: cls.asd ;;; Author: AJ Rossini @@ -11,7 +11,11 @@ ;;; 'releases'. Our software 'escapes', leaving a bloody trail of ;;; designers and quality assurance people in its wake. -;; Load ASDF if it isn't loaded +;; Load ASDF if it isn't loaded -- BUT we need to ensure that we sync +;; properly with the new ASDF! Maybe we should make the git repo a +;; submodule, and tag a particular version to use, pulling that +;; version? + #-asdf(load (pathname (concatenate 'string (namestring *cls-external-dir*) "asdf"))) (in-package :cl-user) @@ -24,11 +28,11 @@ (in-package #:cls-system) -;;; To avoid renaming everything from *.lsp to *.lisp... -;;; borrowed from Cyrus Harmon's work, for example for the ch-util. -;;; NOT secure against serving multiple architectures/hardwares from -;;; the same file system (i.e. PPC and x86 would not be -;;; differentiated). +;;; To avoid renaming everything from *.lsp to *.lisp... borrowed +;;; from Cyrus Harmon's work, for example for the ch-util. NOT secure +;;; against serving multiple architectures/hardwares from the same +;;; file system (i.e. PPC and x86 would not be differentiated). +;;; However, this might be more of a solution for quicklisp? (defclass cls-lsp-source-file (cl-source-file) ()) (defparameter *fasl-directory* @@ -41,7 +45,6 @@ #-(or sbcl openmcl clisp cmucl) "fasl" ))) - ;;; Handle Luke's *.lsp suffix (defmethod source-file-type ((c cls-lsp-source-file) (s module)) "lsp") (defmethod asdf::output-files :around ((operation compile-op) @@ -79,6 +82,7 @@ (:module "packaging" :pathname #p"src/" + :serial t :components ((:file "packages") (:file "config"))) diff --git a/src/config.lisp b/src/config.lisp index 2c12ef8..7f2005c 100644 --- a/src/config.lisp +++ b/src/config.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2010-02-08 16:10:16 tony> +;;; Time-stamp: <2010-09-06 13:46:06 tony> ;;; Creation: <2009-03-12 17:14:56 tony> ;;; File: template.lisp ;;; Author: AJ Rossini @@ -17,7 +17,7 @@ ;;; version.. Think, "21st Century Schizoid Man". ;;; enforce all floating reads as doubles -;; (setf *read-default-float-format* 'double-float) +(setf *read-default-float-format* 'double-float) ;;; optimization settings ;; (proclaim '(optimize (safety 2) (space 3) (speed 3))) @@ -32,7 +32,7 @@ (defparameter *cls-home-dir* (directory-namestring (truename (asdf:system-definition-pathname :cls))) - "Value considered \"home\" for the installation") + "Value considered \"home\" for the installation. Requires the use of ASDF to find out where we are.") #| (setf *cls-home-dir* -- 2.11.4.GIT