[CalendarServer-changes] [474] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Nov 15 13:48:55 PST 2006
Revision: 474
http://trac.macosforge.org/projects/calendarserver/changeset/474
Author: wsanchez at apple.com
Date: 2006-11-15 13:48:55 -0800 (Wed, 15 Nov 2006)
Log Message:
-----------
Move patchmaker.py to support/
Added Paths:
-----------
CalendarServer/trunk/support/patchmaker.py
Removed Paths:
-------------
CalendarServer/trunk/patchmaker.py
Deleted: CalendarServer/trunk/patchmaker.py
===================================================================
--- CalendarServer/trunk/patchmaker.py 2006-11-15 21:03:16 UTC (rev 473)
+++ CalendarServer/trunk/patchmaker.py 2006-11-15 21:48:55 UTC (rev 474)
@@ -1,103 +0,0 @@
-#!/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
-
-#
-# Create a new set of patch files for dependent projects.
-#
-
-#projects = ("Twisted", "vobject", "dateutil", "xattr")
-projects = ("Twisted",)
-cwd = os.getcwd()
-libpatches = os.path.join(cwd, "lib-patches")
-
-svn = "/usr/local/subversion/bin/svn"
-
-def makepatches(project):
-
- # First delete existing patch files.
- path = os.path.join(libpatches, project)
- print "Removing patches from directory: %s" % (path,)
- for file in os.listdir(path):
- fpath = os.path.join(path, file)
- if os.path.isfile(fpath):
- os.remove(fpath)
-
- # Now execute svn status to find files needing to be patched.
- os.system("%s status ../%s > temppatch" % (svn, project))
-
- f = open("temppatch")
- for line in f:
-
- # We are only interested in new files and modified files.
- if line and line[0] == "?":
- new = True
- elif line and line[0] == "M":
- new = False
- else:
- continue
-
- # Ignore files ending in .pyc and file names starting with ".".
- line = line[1:]
- line = line.strip()
- if line.endswith(".pyc"):
- continue
- if os.path.basename(line)[0] == ".":
- 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"
- 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)
-
- # 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 diff %s > tempdiff" % (svn, line))
- if new:
- os.system("%s revert %s" % (svn, line))
-
- # Now replace the directory prefix in the diff output and write to the actual patch file.
- repl = "../%s/" % (project,)
- fin = open("tempdiff")
- fout = open(patch, 'w')
- for line2 in fin:
- fout.write(line2.replace(repl, ""))
- fout.close()
- fin.close()
- os.remove("tempdiff")
-
- f.close()
- os.remove("temppatch")
-
-if __name__ == "__main__":
-
- try:
- for project in projects:
- makepatches(project)
- except Exception, e:
- sys.exit(str(e))
Copied: CalendarServer/trunk/support/patchmaker.py (from rev 473, CalendarServer/trunk/patchmaker.py)
===================================================================
--- CalendarServer/trunk/support/patchmaker.py (rev 0)
+++ CalendarServer/trunk/support/patchmaker.py 2006-11-15 21:48:55 UTC (rev 474)
@@ -0,0 +1,103 @@
+#!/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
+
+#
+# Create a new set of patch files for dependent projects.
+#
+
+#projects = ("Twisted", "vobject", "dateutil", "xattr")
+projects = ("Twisted",)
+cwd = os.getcwd()
+libpatches = os.path.join(cwd, "lib-patches")
+
+svn = "/usr/local/subversion/bin/svn"
+
+def makepatches(project):
+
+ # First delete existing patch files.
+ path = os.path.join(libpatches, project)
+ print "Removing patches from directory: %s" % (path,)
+ for file in os.listdir(path):
+ fpath = os.path.join(path, file)
+ if os.path.isfile(fpath):
+ os.remove(fpath)
+
+ # Now execute svn status to find files needing to be patched.
+ os.system("%s status ../%s > temppatch" % (svn, project))
+
+ f = open("temppatch")
+ for line in f:
+
+ # We are only interested in new files and modified files.
+ if line and line[0] == "?":
+ new = True
+ elif line and line[0] == "M":
+ new = False
+ else:
+ continue
+
+ # Ignore files ending in .pyc and file names starting with ".".
+ line = line[1:]
+ line = line.strip()
+ if line.endswith(".pyc"):
+ continue
+ if os.path.basename(line)[0] == ".":
+ 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"
+ 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)
+
+ # 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 diff %s > tempdiff" % (svn, line))
+ if new:
+ os.system("%s revert %s" % (svn, line))
+
+ # Now replace the directory prefix in the diff output and write to the actual patch file.
+ repl = "../%s/" % (project,)
+ fin = open("tempdiff")
+ fout = open(patch, 'w')
+ for line2 in fin:
+ fout.write(line2.replace(repl, ""))
+ fout.close()
+ fin.close()
+ os.remove("tempdiff")
+
+ f.close()
+ os.remove("temppatch")
+
+if __name__ == "__main__":
+
+ try:
+ for project in projects:
+ makepatches(project)
+ except Exception, e:
+ sys.exit(str(e))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061115/3e1c744c/attachment.html
More information about the calendarserver-changes
mailing list