<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12966] CalendarServer/trunk/support</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12966">12966</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 18:04:41 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>obsolete</pre>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupportpatchapply">CalendarServer/trunk/support/patchapply</a></li>
<li><a href="#CalendarServertrunksupportpatchmaker">CalendarServer/trunk/support/patchmaker</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksupportpatchapply"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/support/patchapply (12965 => 12966)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-#!/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))
</del></span></pre></div>
<a id="CalendarServertrunksupportpatchmaker"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/support/patchmaker (12965 => 12966)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,119 +0,0 @@
</span><del>-#!/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))
</del></span></pre>
</div>
</div>
</body>
</html>