[CalendarServer-changes] [514] CalendarServer/branches/users/cdaboo/availability-509/support

[source_changes at macosforge.org]

Revision: 514
          http://trac.macosforge.org/projects/calendarserver/changeset/514
Author:   cdaboo at apple.com
Date:     2006-11-17 13:34:33 -0800 (Fri, 17 Nov 2006)

Log Message:
-----------
Merged from trunk.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/availability-509/support/patchmaker.py

Added Paths:
-----------
    CalendarServer/branches/users/cdaboo/availability-509/support/patchapply.py

Copied: CalendarServer/branches/users/cdaboo/availability-509/support/patchapply.py (from rev 513, CalendarServer/trunk/support/patchapply.py)
===================================================================
--- CalendarServer/branches/users/cdaboo/availability-509/support/patchapply.py	                        (rev 0)
+++ CalendarServer/branches/users/cdaboo/availability-509/support/patchapply.py	2006-11-17 21:34:33 UTC (rev 514)
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+
+##
+# Copyright (c) 2005-2006 Apple Computer, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# DRI: Cyrus Daboo, cdaboo at apple.com
+##
+
+import os
+import sys
+
+#
+# Apply patches to dependent projects.
+#
+
+#projects = ("Twisted", "vobject", "dateutil", "xattr")
+projects = ("Twisted", "vobject",)
+cwd = os.getcwd()
+libpatches = os.path.join(cwd, "lib-patches")
+
+cmd = "/usr/bin/patch"
+
+def applypatch(project, patch):
+    stat = os.system("%s -s -d ../%s/ -p0 --forward --dry-run -i %s > /dev/null" % (cmd, project, patch, ))
+    if stat == 0:
+        print "+++ Patching %s with %s" % (project, patch[len(cwd) + 1:],)
+        os.system("%s -s -d ../%s/ -p0 --forward -i %s" % (cmd, project, patch, ))
+    else:
+        print "*** Failed to patch %s with %s" % (project, patch[len(cwd) + 1:],)
+
+def applypatches(project):
+    
+    # Iterate over each patch file in the patches directory
+    path = os.path.join(libpatches, project)
+    for file in os.listdir(path):
+        fpath = os.path.join(path, file)
+        if os.path.isfile(fpath) and fpath.endswith(".patch"):
+            applypatch(project, fpath)
+
+if __name__ == "__main__":
+
+    try:
+        for project in projects:
+            applypatches(project)
+    except Exception, e:
+        sys.exit(str(e))

Modified: CalendarServer/branches/users/cdaboo/availability-509/support/patchmaker.py
===================================================================
--- CalendarServer/branches/users/cdaboo/availability-509/support/patchmaker.py	2006-11-17 21:28:29 UTC (rev 513)
+++ CalendarServer/branches/users/cdaboo/availability-509/support/patchmaker.py	2006-11-17 21:34:33 UTC (rev 514)
@@ -26,17 +26,22 @@
 #
 
 #projects = ("Twisted", "vobject", "dateutil", "xattr")
-projects = ("Twisted",)
+projects = ("Twisted", "vobject",)
 cwd = os.getcwd()
 libpatches = os.path.join(cwd, "lib-patches")
 
 svn = "/usr/local/subversion/bin/svn"
 
+# Stuff we have to manually ignore because our ignore logic cannot cope
+ignores = set((
+    "twisted.plugins.dropin.patch",
+))
+
 def makepatches(project):
     
     # First delete existing patch files.
     path = os.path.join(libpatches, project)
-    print "Removing patches from directory: %s" % (path,)
+    print "Removing patches from directory: %s" % (path[len(cwd) + 1:],)
     for file in os.listdir(path):
         fpath = os.path.join(path, file)
         if os.path.isfile(fpath):
@@ -64,22 +69,35 @@
         if os.path.basename(line)[0] == ".":
             continue
         
+        # Ignore build directories at the top-level
+        if line[3 + len(project) + 1:].startswith("build%s" % (os.path.sep,)):
+            continue
+        
+        # Ignore modified directories - we will patch the files in them
+        if not new and os.path.isdir(line):
+            continue
+        
         # Generate the name of the patch file we want to create.
         patch = line[:line.rfind(".")]
         patch = patch[3 + len(project) + 1:]
         patch = patch.replace(os.sep, ".") + ".patch"
+        
+        # Check whether this is a patch we want to ignore
+        if patch in ignores:
+            continue
+
         patch = os.path.join(path, patch)
 
-        print ("Creating diff file %s for existing file %s", "Creating diff file %s for new file %s")[new] % (patch, line)
+        print ("Creating diff file %s for existing file %s", "Creating diff file %s for new file %s")[new] % (patch[len(cwd) + 1:], line)
         
         # Generate an svn diff.
         # NB For new files we have to first add them then do the diff, then revert,
         # otherwise svn diff complains about an unversioned resource.
         if new:
-            os.system("%s add %s" % (svn, line))
+            os.system("%s add -q %s" % (svn, line))
         os.system("%s diff %s > tempdiff" % (svn, line))
         if new:
-            os.system("%s revert %s" % (svn, line))
+            os.system("%s revert -q %s" % (svn, line))
         
         # Now replace the directory prefix in the diff output and write to the actual patch file.
         repl = "../%s/" % (project,)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061117/1e990b9f/attachment.html