[Openmcl-cvs-notifications] r15110 - in /trunk/source/cocoa-ide: Info.plist-proto ide-bundle.lisp ide-contents/Resources/English.lproj/ ide-contents/Resources/en.lproj/

[rme at clozure.com]

Author: rme
Date: Mon Dec  5 11:15:29 2011
New Revision: 15110

Log:
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.

Added:
    trunk/source/cocoa-ide/ide-contents/Resources/English.lproj/   (props c=
hanged)
      - copied from r15091, trunk/source/cocoa-ide/ide-contents/Resources/E=
nglish.lproj/
Removed:
    trunk/source/cocoa-ide/ide-contents/Resources/en.lproj/
Modified:
    trunk/source/cocoa-ide/Info.plist-proto
    trunk/source/cocoa-ide/ide-bundle.lisp

Modified: trunk/source/cocoa-ide/Info.plist-proto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/cocoa-ide/Info.plist-proto (original)
+++ trunk/source/cocoa-ide/Info.plist-proto Mon Dec  5 11:15:29 2011
@@ -3,7 +3,7 @@
 <plist version=3D"1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>English</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>

Modified: trunk/source/cocoa-ide/ide-bundle.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/cocoa-ide/ide-bundle.lisp (original)
+++ trunk/source/cocoa-ide/ide-bundle.lisp Mon Dec  5 11:15:29 2011
@@ -9,48 +9,8 @@
 ;;; at some bundle very early in the process, so do that before anything
 ;;; 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-cont=
ents;")
-				           (source-ignore '(".svn" "cvs" ".cvsignore" "English.lproj" =
".nib"))
+				           (source-ignore '(".svn" "cvs" ".cvsignore"))
 					   (copy-headers *cocoa-application-copy-headers-p*)
                                            (install-altconsole *cocoa-appl=
ication-install-altconsole*)
 					   (if-exists :overwrite))
@@ -65,24 +25,14 @@
 			 (let ((len (length name)))
 			   (and (> len 0)
 				(or (eql (aref name (1- len)) #\~)
-				    (eql (aref name 0) #\#))))))
-		  (nib-p (p)
-		    (let* ((s (car (last (pathname-directory p))))
-			   (len (length s)))
-		      (and (> len 4)
-			   (string=3D ".nib" (subseq s (- len 4)))))))
-	     =

+				    (eql (aref name 0) #\#)))))))
 	     (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))
 	   (target-dir (ensure-directory-pathname bundle-path))
 	   (contents-dir (subdir target-dir "Contents")))
       (recursive-copy-directory source-dir contents-dir :if-exists if-exis=
ts :test #'ignore-test)
-      (process-nibs source-dir contents-dir)
       (when copy-headers
 	(let* ((subdirs (ccl::cdb-subdirectory-path))
 	       (ccl-headers (make-pathname :host "ccl" :directory `(:absolute , at s=
ubdirs)))

Propchange: trunk/source/cocoa-ide/ide-contents/Resources/English.lproj/
---------------------------------------------------------------------------=
---
    svn:ignore =3D *~.nib