[Openmcl-cvs-notifications] r10914 - in /trunk/source: doc/src/install.xml level-1/l1-application.lisp level-1/l1-boot-lds.lisp

[rme at clozure.com]

Author: rme
Date: Sun Sep 28 22:37:02 2008
New Revision: 10914

Log:
On Unix systems, if "ccl-init" is not present, try to load ".ccl-init".
No longer try to load (or warn about) openmcl-init.  Upate manual
to reflect these changes.

(ticket:337)

Modified:
    trunk/source/doc/src/install.xml
    trunk/source/level-1/l1-application.lisp
    trunk/source/level-1/l1-boot-lds.lisp

Modified: trunk/source/doc/src/install.xml
=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/source/doc/src/install.xml (original)
+++ trunk/source/doc/src/install.xml Sun Sep 28 22:37:02 2008
@@ -412,15 +412,17 @@
 	<title>Personal Customization with the Init File</title>
     <para>By default &CCL; tries to load the file
       <literal>"home:ccl-init.lisp"</literal> or the compiled
-	  =

-      <literal>"home:ccl-init.fasl"</literal> upon starting up. For
-      the sake of backward compatibility, it also tries to load the
-      file <literal>"home:openmcl-init.lisp"</literal>, or its compiled
-      equivalent. &CCL; does this by executing <literal>(load
+      <literal>"home:ccl-init.fasl"</literal> upon starting up.
+      &CCL; does this by executing <literal>(load
       "home:ccl-init")</literal>.  If it's unable to load the file
       (for example because the file doesn't exist), &CCL; doesn't
       signal an error or warning, it just completes its startup
       normally.</para>
+    <para>
+      On Unix systems, if <literal>"ccl-init.lisp"</literal> is not
+      present, &CCL; will look for <literal>".ccl-init.lisp"</literal>
+      (post 1.2 versions only).
+    </para>
     <para>The <literal>"home:"</literal> prefix to the filename is a
       Common Lisp logical host, which &CCL; initializes to refer to
       your home directory. &CCL; therefore looks for either of the

Modified: trunk/source/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/source/level-1/l1-application.lisp (original)
+++ trunk/source/level-1/l1-application.lisp Sun Sep 28 22:37:02 2008
@@ -301,8 +301,8 @@
 =

 (defmethod application-init-file ((app lisp-development-system))
   ;; 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")
+  #+unix '("home:ccl-init" "home:\\.ccl-init")
+  #+windows "home:ccl-init")
 =

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

Modified: trunk/source/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/source/level-1/l1-boot-lds.lisp (original)
+++ trunk/source/level-1/l1-boot-lds.lisp Sun Sep 28 22:37:02 2008
@@ -32,9 +32,6 @@
       (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)