Changeset 15110


Ignore:
Timestamp:
Dec 5, 2011, 5:15:29 PM (8 years ago)
Author:
rme
Message:

Revert r15092 (switch to xib format). There's no way to compile
a xib file on Windows, which makes it impossible to build the
IDE on Windows.

Location:
trunk/source/cocoa-ide
Files:
1 deleted
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/source/cocoa-ide/Info.plist-proto

    r15092 r15110  
    44<dict>
    55        <key>CFBundleDevelopmentRegion</key>
    6         <string>en</string>
     6        <string>English</string>
    77        <key>CFBundleDocumentTypes</key>
    88        <array>
  • trunk/source/cocoa-ide/ide-bundle.lisp

    r15092 r15110  
    1010;;; else.
    1111
    12 (defvar *ibtool-program* "/Developer/usr/bin/ibtool")
    13 
    14 (defun compile-xib (xib &optional output-nib)
    15   (unless output-nib
    16     (setq output-nib (make-pathname :type "nib" :defaults xib)))
    17   (with-output-to-string (s)
    18     (let* ((nib-namestring (native-translated-namestring output-nib))
    19            (xib-namestring (native-translated-namestring xib))
    20            (p (run-program *ibtool-program*
    21                            (list "--errors" "--warnings" "--notices"
    22                                  "--output-format" "human-readable-text"
    23                                  "--compile" nib-namestring
    24                                  xib-namestring)
    25                            :output s
    26                            :error :output)))
    27       (multiple-value-bind (status exit-code)
    28           (external-process-status p)
    29         (unless (and (eq :exited status)
    30                      (zerop exit-code))
    31           (error "Error compiling xib file ~s:~%~a" xib
    32                  (or (describe-external-process-failure p "no ibtool?")
    33                      (get-output-stream-string s))))))))
    34 
    35 (defun process-nibs (src-contents-path dest-contents-path)
    36   (let* ((dest-dir (ensure-directory-pathname dest-contents-path))
    37          (src-dir (ensure-directory-pathname src-contents-path))
    38          (dest-nib-dir (merge-pathnames #p"Resources/en.lproj/"
    39                                         dest-dir))
    40          (src-nib-dir (merge-pathnames #p"Resources/en.lproj/"
    41                                        src-dir)))
    42     ;; process xib files
    43     (ensure-directories-exist dest-nib-dir)
    44     (format t "~&;building nib files...")
    45     (dolist (x (directory (merge-pathnames #p"*.xib" src-nib-dir)))
    46       (let ((dest (make-pathname :name (pathname-name x)
    47                                  :type "nib"
    48                                  :defaults dest-nib-dir)))
    49         (compile-xib x dest)))
    50     (format t "done.~%")))
    51 
    5212(defun create-ide-bundle (bundle-path &key (source "ccl:cocoa-ide;ide-contents;")
    53                                            (source-ignore '(".svn" "cvs" ".cvsignore" "English.lproj" ".nib"))
     13                                           (source-ignore '(".svn" "cvs" ".cvsignore"))
    5414                                           (copy-headers *cocoa-application-copy-headers-p*)
    5515                                           (install-altconsole *cocoa-application-install-altconsole*)
     
    6626                           (and (> len 0)
    6727                                (or (eql (aref name (1- len)) #\~)
    68                                     (eql (aref name 0) #\#))))))
    69                   (nib-p (p)
    70                     (let* ((s (car (last (pathname-directory p))))
    71                            (len (length s)))
    72                       (and (> len 4)
    73                            (string= ".nib" (subseq s (- len 4)))))))
    74              
     28                                    (eql (aref name 0) #\#)))))))
    7529             (not (or (member (car (last (pathname-directory p))) source-ignore :test #'equalp)
    7630                      (backup-p (file-namestring p))
    77                       (nib-p p)
    78                       (equalp (pathname-type p) "xib")
    79                       (equalp (pathname-type p) "nib")
    8031                      (member (file-namestring p) source-ignore :test #'equalp))))))
    8132    (let* ((source-dir (ensure-directory-pathname source))
     
    8334           (contents-dir (subdir target-dir "Contents")))
    8435      (recursive-copy-directory source-dir contents-dir :if-exists if-exists :test #'ignore-test)
    85       (process-nibs source-dir contents-dir)
    8636      (when copy-headers
    8737        (let* ((subdirs (ccl::cdb-subdirectory-path))
Note: See TracChangeset for help on using the changeset viewer.