[Openmcl-cvs-notifications] r13035 - in /trunk/source/cocoa-ide: build-application.lisp builder-utilities.lisp

[palter at clozure.com]

Author: palter
Date: Fri Oct 16 18:24:04 2009
New Revision: 13035

Log:
Make BUILD-APPLICATION also skip over version control data files

Modified:
    trunk/source/cocoa-ide/build-application.lisp
    trunk/source/cocoa-ide/builder-utilities.lisp

Modified: trunk/source/cocoa-ide/build-application.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/build-application.lisp (original)
+++ trunk/source/cocoa-ide/build-application.lisp Fri Oct 16 18:24:04 2009
@@ -58,6 +58,7 @@
     (when copy-ide-resources
       (recursive-copy-directory (path ide-bundle-path "Contents" "Resource=
s/")
                                 (path app-bundle  "Contents" "Resources/")
+                                :test #'not-vc-control-file
                                 :if-exists :overwrite))
     ;; write Info.plist
     (write-info-plist info-plist (path app-bundle "Contents" "Info.plist")

Modified: trunk/source/cocoa-ide/builder-utilities.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/builder-utilities.lisp (original)
+++ trunk/source/cocoa-ide/builder-utilities.lisp Fri Oct 16 18:24:04 2009
@@ -90,6 +90,19 @@
 (defparameter $ls-type-is-package-key #@"LSTypeIsPackage")
 (defparameter $ns-document-class-key #@"NSDocumentClass")
 (defparameter $ns-exportable-as-key #@"NSExportableAs")
+
+;;; NOT-VC-CONTROL-FILE (path)
+;;; ----------------------------------------------------------------------=
--
+;;; Returns T if the specified file (or directory) is not part of a version
+;;; control system's control data
+
+(defun not-vc-control-file (path)
+  (let ((vc-directories '(".svn" "CVS"))
+        (vc-files '("svn-commit.tmp" "svn-commit.tmp~"
+                    "svn-prop.tmp" "svn-prop.tmp~"
+                    ".cvsignore")))
+    (not (or (member (car (last (pathname-directory path))) vc-directories=
 :test #'equalp)
+             (member (file-namestring path) vc-files :test #'equalp)))))
 =

 ;;; COPY-NIBFILE (srcnib dest-directory &key (if-exists :overwrite))
 ;;; ----------------------------------------------------------------------=
--
@@ -109,7 +122,7 @@
                             (delete-file dest))))
           (:error (error "The nibfile '~A' already exists" dest))))
     (if (directoryp srcnib)
-        (recursive-copy-directory srcnib dest)
+        (recursive-copy-directory srcnib dest :test #'not-vc-control-file)
         (copy-file srcnib dest))))
 =

 ;;; BASENAME path
@@ -374,6 +387,7 @@
                                :defaults target))))
         (dolist (framework private-frameworks)
           (recursive-copy-directory framework (subdir framework frameworks=
-dir)
+                                    :test #'not-vc-control-file
                                     :if-exists :overwrite)
           #+windows-target
           (let ((executable (find-framework-executable framework)))