Changeset 7487


Ignore:
Timestamp:
Oct 21, 2007, 11:53:06 AM (14 years ago)
Author:
gz
Message:

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).

Location:
trunk/ccl
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/level-0/l0-init.lisp

    r6257 r7487  
    2727    :openmcl
    2828    :clozure
     29    :clozure-common-lisp
    2930    :ansi-cl
    3031    :unix
  • trunk/ccl/level-1/l1-application.lisp

    r7364 r7487  
    293293
    294294(defmethod application-init-file ((app lisp-development-system))
    295   #+clozure-common-lisp "home:ccl-init"  ;; This is the init file loaded before cocoa.
     295  ;; This is the init file loaded before cocoa.
     296  #+clozure-common-lisp '("home:ccl-init" "home:openmcl-init") ;; transitional kludge
    296297  #-clozure-common-lisp "home:openmcl-init")
    297298
  • trunk/ccl/level-1/l1-boot-lds.lisp

    r5893 r7487  
    2929(defun startup-ccl (&optional init-file)
    3030  (with-simple-restart (abort "Abort startup.")
    31     (when init-file
    32       (with-simple-restart (continue "Skip loading init file.")
    33         (load init-file :if-does-not-exist nil :verbose nil)))
     31    (let ((init-files (if (listp init-file) init-file (list init-file))))
     32      (dolist (init-file init-files)
     33        (with-simple-restart (continue "Skip loading init file.")
     34          (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"))
     38            (return)))))
    3439    (flet ((eval-string (s)
    3540             (with-simple-restart (continue "Skip evaluation of ~a" s)
Note: See TracChangeset for help on using the changeset viewer.