Changeset 15092

Timestamp:

Nov 23, 2011, 3:35:43 PM (13 years ago)

Author:

R. Matthew Emerson

Message:

Convert Interface Builder files to .xib format. This requires
more work at build time, because .xib files must be compiled
into a deployable .nib file. Make additions to ide-bundle.lisp
to do this. (We use the ibtool program, which is installed as
part of Xcode.)

Put the .xib files (and other localizable resources) into
a new directory named en.lproj. This is what Xcode uses
when creating new projects. Delete the old English.lproj
directory and its contents.

Update the Info.plist template accordingly.

Location:

trunk/source/cocoa-ide

Files:

• Info.plist-proto (modified) (1 diff)
• ide-bundle.lisp (modified) (3 diffs)
• ide-contents/Resources/English.lproj (deleted)
• ide-contents/Resources/en.lproj (added)
• ide-contents/Resources/en.lproj/Authenticate.xib (added)
• ide-contents/Resources/en.lproj/Credits.html (copied) (copied from trunk/source/cocoa-ide/ide-contents/Resources/English.lproj/Credits.html )
• ide-contents/Resources/en.lproj/MainMenu.xib (added)
• ide-contents/Resources/en.lproj/OpenmclInspector.xib (added)
• ide-contents/Resources/en.lproj/ProgressWindow.xib (added)
• ide-contents/Resources/en.lproj/SearchFiles.xib (added)
• ide-contents/Resources/en.lproj/apropos.xib (added)
• ide-contents/Resources/en.lproj/backtrace.xib (added)
• ide-contents/Resources/en.lproj/displaydoc.xib (added)
• ide-contents/Resources/en.lproj/inspector.xib (added)
• ide-contents/Resources/en.lproj/preferences.xib (added)
• ide-contents/Resources/en.lproj/processes.xib (added)
• ide-contents/Resources/en.lproj/project.xib (added)
• ide-contents/Resources/en.lproj/updateCCL.xib (added)
• ide-contents/Resources/en.lproj/xapropos.xib (added)
• ide-contents/Resources/en.lproj/xinspector.xib (added)

trunk/source/cocoa-ide/Info.plist-proto

@@ -4 +4 @@
 <dict>
         <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
+        <string>en</string>
         <key>CFBundleDocumentTypes</key>
         <array>

trunk/source/cocoa-ide/ide-bundle.lisp

@@ -10 +10 @@
 ;;; else.
 
+(defvar *ibtool-program* "/Developer/usr/bin/ibtool")
+
+(defun compile-xib (xib &optional output-nib)
+  (unless output-nib
+    (setq output-nib (make-pathname :type "nib" :defaults xib)))
+  (with-output-to-string (s)
+    (let* ((nib-namestring (native-translated-namestring output-nib))
+           (xib-namestring (native-translated-namestring xib))
+           (p (run-program *ibtool-program*
+                           (list "--errors" "--warnings" "--notices"
+                                 "--output-format" "human-readable-text"
+                                 "--compile" nib-namestring
+                                 xib-namestring)
+                           :output s
+                           :error :output)))
+      (multiple-value-bind (status exit-code)
+          (external-process-status p)
+        (unless (and (eq :exited status)
+                     (zerop exit-code))
+          (error "Error compiling xib file ~s:~%~a" xib
+                 (or (describe-external-process-failure p "no ibtool?")
+                     (get-output-stream-string s))))))))
+
+(defun process-nibs (src-contents-path dest-contents-path)
+  (let* ((dest-dir (ensure-directory-pathname dest-contents-path))
+         (src-dir (ensure-directory-pathname src-contents-path))
+         (dest-nib-dir (merge-pathnames #p"Resources/en.lproj/"
+                                        dest-dir))
+         (src-nib-dir (merge-pathnames #p"Resources/en.lproj/"
+                                       src-dir)))
+    ;; process xib files
+    (ensure-directories-exist dest-nib-dir)
+    (format t "~&;building nib files...")
+    (dolist (x (directory (merge-pathnames #p"*.xib" src-nib-dir)))
+      (let ((dest (make-pathname :name (pathname-name x)
+                                 :type "nib"
+                                 :defaults dest-nib-dir)))
+        (compile-xib x dest)))
+    (format t "done.~%")))
+
 (defun create-ide-bundle (bundle-path &key (source "ccl:cocoa-ide;ide-contents;")
-                                           (source-ignore '(".svn" "cvs" ".cvsignore"))
+                                           (source-ignore '(".svn" "cvs" ".cvsignore" "English.lproj" ".nib"))
                                            (copy-headers *cocoa-application-copy-headers-p*)
                                            (install-altconsole *cocoa-application-install-altconsole*)
@@ -26 +66 @@
                            (and (> len 0)
                                 (or (eql (aref name (1- len)) #\~)
-                                    (eql (aref name 0) #\#)))))))
+                                    (eql (aref name 0) #\#))))))
+                  (nib-p (p)
+                    (let* ((s (car (last (pathname-directory p))))
+                           (len (length s)))
+                      (and (> len 4)
+                           (string= ".nib" (subseq s (- len 4)))))))
+             
              (not (or (member (car (last (pathname-directory p))) source-ignore :test #'equalp)
                       (backup-p (file-namestring p))
+                      (nib-p p)
+                      (equalp (pathname-type p) "xib")
+                      (equalp (pathname-type p) "nib")
                       (member (file-namestring p) source-ignore :test #'equalp))))))
     (let* ((source-dir (ensure-directory-pathname source))
@@ -34 +83 @@
            (contents-dir (subdir target-dir "Contents")))
       (recursive-copy-directory source-dir contents-dir :if-exists if-exists :test #'ignore-test)
+      (process-nibs source-dir contents-dir)
       (when copy-headers
         (let* ((subdirs (ccl::cdb-subdirectory-path))