Changeset 10914

Timestamp:

Sep 29, 2008, 2:37:02 AM (12 years ago)

Author:

rme

Message:

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)

Location:

trunk/source

Files:

• doc/src/install.xml (modified) (1 diff)
• level-1/l1-application.lisp (modified) (1 diff)
• level-1/l1-boot-lds.lisp (modified) (1 diff)

trunk/source/doc/src/install.xml

@@ -413 +413 @@
     <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

trunk/source/level-1/l1-application.lisp

@@ -302 +302 @@
 (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") ;; transitional 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)

trunk/source/level-1/l1-boot-lds.lisp

@@ -33 +33 @@
         (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 rename your init file to ccl-init.lisp"))
             (return)))))
     (flet ((eval-string (s)