Changeset 10914


Ignore:
Timestamp:
Sep 29, 2008, 2:37:02 AM (11 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/doc/src/install.xml

    r10218 r10914  
    413413    <para>By default &CCL; tries to load the file
    414414      <literal>"home:ccl-init.lisp"</literal> or the compiled
    415          
    416       <literal>"home:ccl-init.fasl"</literal> upon starting up. For
    417       the sake of backward compatibility, it also tries to load the
    418       file <literal>"home:openmcl-init.lisp"</literal>, or its compiled
    419       equivalent. &CCL; does this by executing <literal>(load
     415      <literal>"home:ccl-init.fasl"</literal> upon starting up.
     416      &CCL; does this by executing <literal>(load
    420417      "home:ccl-init")</literal>.  If it's unable to load the file
    421418      (for example because the file doesn't exist), &CCL; doesn't
    422419      signal an error or warning, it just completes its startup
    423420      normally.</para>
     421    <para>
     422      On Unix systems, if <literal>"ccl-init.lisp"</literal> is not
     423      present, &CCL; will look for <literal>".ccl-init.lisp"</literal>
     424      (post 1.2 versions only).
     425    </para>
    424426    <para>The <literal>"home:"</literal> prefix to the filename is a
    425427      Common Lisp logical host, which &CCL; initializes to refer to
  • trunk/source/level-1/l1-application.lisp

    r10823 r10914  
    302302(defmethod application-init-file ((app lisp-development-system))
    303303  ;; This is the init file loaded before cocoa.
    304   #+clozure-common-lisp '("home:ccl-init" "home:openmcl-init") ;; transitional kludge
    305   #-clozure-common-lisp "home:openmcl-init")
     304  #+unix '("home:ccl-init" "home:\\.ccl-init")
     305  #+windows "home:ccl-init")
    306306
    307307(defmethod application-error ((a application) condition error-pointer)
  • trunk/source/level-1/l1-boot-lds.lisp

    r8914 r10914  
    3333        (with-simple-restart (continue "Skip loading init file.")
    3434          (when (load init-file :if-does-not-exist nil :verbose nil)
    35             #+clozure-common-lisp ;; Kludge to help people transition
    36             (when (equalp (pathname-name init-file) "openmcl-init")
    37               (warn ">>>>>> The use of openmcl-init.lisp is deprecated.  Please rename your init file to ccl-init.lisp"))
    3835            (return)))))
    3936    (flet ((eval-string (s)
Note: See TracChangeset for help on using the changeset viewer.