Changeset 14298


Ignore:
Timestamp:
Sep 22, 2010, 6:36:40 PM (9 years ago)
Author:
gz
Message:

Don't use asdf for easygui, this fixes ticket:745

Location:
trunk/source
Files:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/cocoa-ide/defsystem.lisp

    r14238 r14298  
    9595    ))
    9696
     97(defun load-ide-files (names src-dir force-compile)
     98  (declare (special *hemlock-files*)) ;; kludge
     99  (let* ((bin-dir (merge-pathnames ";fasls;" src-dir)))
     100    (ensure-directories-exist bin-dir)
     101    (with-compilation-unit ()
     102      (dolist (name names)
     103        (let* ((source (make-pathname :name name :type (pathname-type *.lisp-pathname*)
     104                                      :defaults src-dir))
     105               (fasl (make-pathname :name name :type (pathname-type *.fasl-pathname*)
     106                                    :defaults bin-dir))
     107               (sources (cons source
     108                              (and (equalp name "hemlock")
     109                                   ;; This is defined in compile-hemlock, which is loaded first
     110                                   (mapcar #'hemlock-source-pathname *hemlock-files*)))))
     111          (if (needs-compile-p fasl sources force-compile)
     112            (progn
     113              ;; Once compile something, keep compiling, in case macros changed.
     114              (setq force-compile t)
     115              (compile-file source :output-file fasl :verbose t :load t))
     116            (load fasl :verbose t))))))
     117  force-compile)
     118
    97119(defun load-ide (&optional force-compile)
    98   (declare (special *hemlock-files*)) ;; kludge
    99   (let ((src-dir "ccl:cocoa-ide;")
    100         (bin-dir "ccl:cocoa-ide;fasls;"))
    101     (ensure-directories-exist bin-dir)
    102     ;; kludge to limit experimental files to Leopard
    103     #+darwin-target
    104     (rlet ((p :int))
    105       (#_Gestalt #$gestaltSystemVersion p)
    106       (when (>= (%get-long p) #x1050)
    107         (setq *ide-files* (append *ide-files* *leopard-only-ide-files*))))
    108     (with-compilation-unit ()
    109       (dolist (name *ide-files*)
    110         (let* ((source (make-pathname :name name :type (pathname-type *.lisp-pathname*)
    111                                       :defaults src-dir))
    112                (fasl (make-pathname :name name :type (pathname-type *.fasl-pathname*)
    113                                     :defaults bin-dir))
    114                (sources (cons source
    115                               (and (equalp name "hemlock")
    116                                    ;; This is defined in compile-hemlock, which is loaded first
    117                                    (mapcar #'hemlock-source-pathname *hemlock-files*)))))
    118           (if (needs-compile-p fasl sources force-compile)
    119             (progn
    120               ;; Once compile something, keep compiling, in case macros changed.
    121               (setq force-compile t)
    122               (compile-file source :output-file fasl :verbose t :load t))
    123             (load fasl :verbose t)))))
    124     (provide "COCOA")))
     120  ;; kludge to limit experimental files to Leopard
     121  #+darwin-target
     122  (rlet ((p :int))
     123    (#_Gestalt #$gestaltSystemVersion p)
     124    (when (>= (%get-long p) #x1050)
     125      (setq *ide-files* (append *ide-files* *leopard-only-ide-files*))))
     126  (load-ide-files *ide-files* "ccl:cocoa-ide;" force-compile)
     127  (provide "COCOA"))
  • trunk/source/examples/cocoa/easygui.lisp

    r7460 r14298  
    1 (in-package :cl-user)
     1(in-package :ccl)
    22
    33(let ((path (or *load-pathname* *loading-file-source-file*)))
    4   (load (merge-pathnames ";easygui;easygui.asd" path)))
    5 
    6 (asdf:operate 'asdf:load-op 'easygui)
    7 
    8 (push :easygui *features*)
     4  (load (merge-pathnames ";easygui;system.lisp" path))
     5  (load-easygui *cocoa-ide-force-compile*))
Note: See TracChangeset for help on using the changeset viewer.