Changeset 13049


Ignore:
Timestamp:
Oct 20, 2009, 1:20:05 AM (10 years ago)
Author:
rme
Message:

Merge trunk changes r13033 through 13035, r13048.

Location:
release/1.4/source/cocoa-ide
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • release/1.4/source/cocoa-ide/build-application.lisp

    r12836 r13049  
    5959      (recursive-copy-directory (path ide-bundle-path "Contents" "Resources/")
    6060                                (path app-bundle  "Contents" "Resources/")
     61                                :test #'not-vc-control-file
    6162                                :if-exists :overwrite))
    6263    ;; write Info.plist
  • release/1.4/source/cocoa-ide/builder-utilities.lisp

    r12704 r13049  
    9191(defparameter $ns-document-class-key #@"NSDocumentClass")
    9292(defparameter $ns-exportable-as-key #@"NSExportableAs")
     93
     94;;; NOT-VC-CONTROL-FILE (path)
     95;;; ------------------------------------------------------------------------
     96;;; Returns T if the specified file (or directory) is not part of a version
     97;;; control system's control data
     98
     99(defun not-vc-control-file (path)
     100  (let ((vc-directories '(".svn" "CVS"))
     101        (vc-files '("svn-commit.tmp" "svn-commit.tmp~"
     102                    "svn-prop.tmp" "svn-prop.tmp~"
     103                    ".cvsignore")))
     104    (not (or (member (car (last (pathname-directory path))) vc-directories :test #'equalp)
     105             (member (file-namestring path) vc-files :test #'equalp)))))
    93106
    94107;;; COPY-NIBFILE (srcnib dest-directory &key (if-exists :overwrite))
     
    110123          (:error (error "The nibfile '~A' already exists" dest))))
    111124    (if (directoryp srcnib)
    112         (recursive-copy-directory srcnib dest)
     125        (recursive-copy-directory srcnib dest :test #'not-vc-control-file)
    113126        (copy-file srcnib dest))))
    114127
     
    375388        (dolist (framework private-frameworks)
    376389          (recursive-copy-directory framework (subdir framework frameworks-dir)
     390                                    :test #'not-vc-control-file
    377391                                    :if-exists :overwrite)
    378392          #+windows-target
  • release/1.4/source/cocoa-ide/ide-bundle.lisp

    r12834 r13049  
    2828                                    (eql (aref name 0) #\#)))))))
    2929             (not (or (member (car (last (pathname-directory p))) source-ignore :test #'equalp)
    30                       (backup-p (pathname-name p))
    31                       (backup-p (pathname-type p))
    32                       (member (pathname-name p) source-ignore :test #'equalp))))))
     30                      (backup-p (file-namestring p))
     31                      (member (file-namestring p) source-ignore :test #'equalp))))))
    3332    (let* ((source-dir (ensure-directory-pathname source))
    3433           (target-dir (ensure-directory-pathname bundle-path))
  • release/1.4/source/cocoa-ide/project.lisp

    r13031 r13049  
    135135        (setf (#/label toolbar-item) #@"Get Info"
    136136              (#/paletteLabel toolbar-item) #@"Get Info"
    137               (#/image toolbar-item) (#/imageNamed: ns:ns-image
    138                                                     #&NSImageNameInfo)
     137              #-cocotron (#/image toolbar-item) #-cocotron (#/imageNamed: ns:ns-image
     138                                                                          #&NSImageNameInfo)
    139139              (#/target toolbar-item) self
    140140              (#/action toolbar-item) (@selector #/showInfoPanel)
     
    144144        (setf (#/label toolbar-item) #@"Edit"
    145145              (#/paletteLabel toolbar-item) #@"Edit"
    146               (#/image toolbar-item) (#/imageNamed: ns:ns-image
    147                                                     #&NSImageNameFontPanel)
     146              #-cocotron (#/image toolbar-item) #-cocotron (#/imageNamed: ns:ns-image
     147                                                                          #&NSImageNameFontPanel)
    148148              (#/target toolbar-item) self
    149149              (#/action toolbar-item) (@selector #/openSystem:)
Note: See TracChangeset for help on using the changeset viewer.