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

Merge trunk changes r13033 through 13035, r13048.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.