[Openmcl-cvs-notifications] r7487 - in /trunk/ccl: cocoa-ide/OpenMCL.app/ level-0/l0-init.lisp level-1/l1-application.lisp level-1/l1-boot-lds.lisp

[gz at clozure.com]

Author: gz
Date: Sun Oct 21 07:53:06 2007
New Revision: 7487

Log:
Add :clozure-common-lisp to *features*.

Allow the init-file arg to startup-ccl to be a list of filenames -
the first one that exists is used.  Make the lisp-development-system
application-init-file be the list of ccl-init and openmcl-init, but
warn if openmcl-init is the one that's actually used.

Delete cocoa-ide/OpenMCL.app to minimize confusion (this means
removing :clozure-common-lisp from *features* no longer works
for the IDE, although it still works for the command line build).

Removed:
    trunk/ccl/cocoa-ide/OpenMCL.app/
Modified:
    trunk/ccl/level-0/l0-init.lisp
    trunk/ccl/level-1/l1-application.lisp
    trunk/ccl/level-1/l1-boot-lds.lisp

Modified: trunk/ccl/level-0/l0-init.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/ccl/level-0/l0-init.lisp (original)
+++ trunk/ccl/level-0/l0-init.lisp Sun Oct 21 07:53:06 2007
@@ -26,6 +26,7 @@
   '(:common-lisp
     :openmcl
     :clozure
+    :clozure-common-lisp
     :ansi-cl
     :unix
     :openmcl-unicode-strings

Modified: trunk/ccl/level-1/l1-application.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/ccl/level-1/l1-application.lisp (original)
+++ trunk/ccl/level-1/l1-application.lisp Sun Oct 21 07:53:06 2007
@@ -292,7 +292,8 @@
 =

 =

 (defmethod application-init-file ((app lisp-development-system))
-  #+clozure-common-lisp "home:ccl-init"  ;; This is the init file loaded b=
efore cocoa.
+  ;; This is the init file loaded before cocoa.
+  #+clozure-common-lisp '("home:ccl-init" "home:openmcl-init") ;; transiti=
onal kludge
   #-clozure-common-lisp "home:openmcl-init")
 =

 (defmethod application-error ((a application) condition error-pointer)

Modified: trunk/ccl/level-1/l1-boot-lds.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/ccl/level-1/l1-boot-lds.lisp (original)
+++ trunk/ccl/level-1/l1-boot-lds.lisp Sun Oct 21 07:53:06 2007
@@ -28,9 +28,14 @@
 =

 (defun startup-ccl (&optional init-file)
   (with-simple-restart (abort "Abort startup.")
-    (when init-file
-      (with-simple-restart (continue "Skip loading init file.")
-	(load init-file :if-does-not-exist nil :verbose nil)))
+    (let ((init-files (if (listp init-file) init-file (list init-file))))
+      (dolist (init-file init-files)
+	(with-simple-restart (continue "Skip loading init file.")
+	  (when (load init-file :if-does-not-exist nil :verbose nil)
+	    #+clozure-common-lisp ;; Kludge to help people transition
+	    (when (equalp (pathname-name init-file) "openmcl-init")
+	      (warn ">>>>>> The use of openmcl-init.lisp is deprecated.  Please r=
ename your init file to ccl-init.lisp"))
+	    (return)))))
     (flet ((eval-string (s)
 	     (with-simple-restart (continue "Skip evaluation of ~a" s)
 	       (eval (read-from-string s))))