[CalendarServer-changes] [12966] CalendarServer/trunk/support
source_changes at macosforge.org
source_changes at macosforge.org
Tue Mar 18 18:04:41 PDT 2014
Revision: 12966
http://trac.calendarserver.org//changeset/12966
Author: wsanchez at apple.com
Date: 2014-03-18 18:04:41 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
obsolete
Removed Paths:
-------------
CalendarServer/trunk/support/patchapply
CalendarServer/trunk/support/patchmaker
Deleted: CalendarServer/trunk/support/patchapply
===================================================================
--- CalendarServer/trunk/support/patchapply 2014-03-19 01:03:52 UTC (rev 12965)
+++ CalendarServer/trunk/support/patchapply 2014-03-19 01:04:41 UTC (rev 12966)
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-
-##
-# Copyright (c) 2005-2014 Apple 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.
-##
-
-import os
-import sys
-
-#
-# Apply patches to dependent projects.
-#
-
-#projects = ("Twisted", "dateutil", "xattr")
-projects = ()
-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)
- if os.path.exists(path):
- 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))
Deleted: CalendarServer/trunk/support/patchmaker
===================================================================
--- CalendarServer/trunk/support/patchmaker 2014-03-19 01:03:52 UTC (rev 12965)
+++ CalendarServer/trunk/support/patchmaker 2014-03-19 01:04:41 UTC (rev 12966)
@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-
-##
-# Copyright (c) 2005-2014 Apple 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.
-##
-
-import os
-import sys
-
-#
-# Create a new set of patch files for dependent projects.
-#
-
-#projects = ("Twisted", "dateutil", "xattr")
-projects = ()
-cwd = os.getcwd()
-libpatches = os.path.join(cwd, "lib-patches")
-
-svn = "/usr/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[len(cwd) + 1:],)
- 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
-
- # 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[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 -q %s" % (svn, line))
- os.system("%s diff %s > tempdiff" % (svn, line))
- if new:
- 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,)
- 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: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140318/e3f4e383/attachment.html>
More information about the calendarserver-changes
mailing list