<!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>[12076] CalendarServer/trunk/setup.py</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/12076">12076</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 17:49:39 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>cosmetic</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (12075 => 12076)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2013-12-13 01:42:24 UTC (rev 12075)
+++ CalendarServer/trunk/setup.py 2013-12-13 01:49:39 UTC (rev 12076)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx">
</span><span class="cx"> from version import version
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> def find_modules():
</span><span class="cx"> modules = [
</span><span class="cx"> "twisted.plugins",
</span><span class="lines">@@ -52,9 +54,9 @@
</span><span class="cx"> # Options
</span><span class="cx"> #
</span><span class="cx">
</span><del>-description = "CalDAV/CardDAV protocol extensions to twext.web2.dav",
</del><ins>+description = "Calendar and Contacts Server",
</ins><span class="cx"> long_description = """
</span><del>-Extends twisted.web2.dav to implement CalDAV/CardDAV-aware resources and methods.
</del><ins>+Calendar and Contacts Server, implementing the CalDAV and CardDAV protocols.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> classifiers = None
</span><span class="lines">@@ -65,7 +67,10 @@
</span><span class="cx">
</span><span class="cx"> version_number, version_info = version()
</span><span class="cx">
</span><del>-version_string = "{number} ({info})".format(number=version_number, info=version_info)
</del><ins>+version_string = (
+ "{number} ({info})"
+ .format(number=version_number, info=version_info)
+)
</ins><span class="cx"> version_file = file(os.path.join("calendarserver", "version.py"), "w")
</span><span class="cx"> version_file.write('version = "{version}"\n'.format(version=version_string))
</span><span class="cx"> version_file.close()
</span><span class="lines">@@ -115,50 +120,50 @@
</span><span class="cx"> platforms=["all"],
</span><span class="cx"> packages=find_modules(),
</span><span class="cx"> package_data={
</span><del>- "twistedcaldav": [
- "*.html",
- "zoneinfo/*.ics",
- "zoneinfo/*/*.ics",
- "zoneinfo/*/*/*.ics",
- "images/*/*.jpg",
- ],
- "calendarserver.webadmin": [
- "*.html"
- ],
- "twistedcaldav.directory": [
- "*.html"
- ],
- "txdav.common.datastore": [
- "sql_schema/*.sql",
- "sql_schema/*/*.sql",
- "sql_schema/*/*/*.sql",
- ],
- },
</del><ins>+ "twistedcaldav": [
+ "*.html",
+ "zoneinfo/*.ics",
+ "zoneinfo/*/*.ics",
+ "zoneinfo/*/*/*.ics",
+ "images/*/*.jpg",
+ ],
+ "calendarserver.webadmin": [
+ "*.html"
+ ],
+ "twistedcaldav.directory": [
+ "*.html"
+ ],
+ "txdav.common.datastore": [
+ "sql_schema/*.sql",
+ "sql_schema/*/*.sql",
+ "sql_schema/*/*/*.sql",
+ ],
+ },
</ins><span class="cx"> scripts=[
</span><del>- "bin/caldavd",
- "bin/calendarserver_backup",
- "bin/calendarserver_bootstrap_database",
- "bin/calendarserver_command_gateway",
- "bin/calendarserver_config",
- #"bin/calendarserver_dbinspect",
- #"bin/calendarserver_dkimtool",
- "bin/calendarserver_export",
- #"bin/calendarserver_icalendar_validate",
- #"bin/calendarserver_load_augmentdb",
- #"bin/calendarserver_manage_postgres",
- "bin/calendarserver_manage_principals",
- "bin/calendarserver_manage_push",
- "bin/calendarserver_manage_timezones",
- "bin/calendarserver_migrate_resources",
- #"bin/calendarserver_monitor_amp_notifications",
- #"bin/calendarserver_monitor_notifications",
- "bin/calendarserver_purge_attachments",
- "bin/calendarserver_purge_events",
- "bin/calendarserver_purge_principals",
- "bin/calendarserver_shell",
- "bin/calendarserver_upgrade",
- #"bin/calendarserver_verify_data",
- ],
</del><ins>+ "bin/caldavd",
+ "bin/calendarserver_backup",
+ "bin/calendarserver_bootstrap_database",
+ "bin/calendarserver_command_gateway",
+ "bin/calendarserver_config",
+ # "bin/calendarserver_dbinspect",
+ # "bin/calendarserver_dkimtool",
+ "bin/calendarserver_export",
+ # "bin/calendarserver_icalendar_validate",
+ # "bin/calendarserver_load_augmentdb",
+ # "bin/calendarserver_manage_postgres",
+ "bin/calendarserver_manage_principals",
+ "bin/calendarserver_manage_push",
+ "bin/calendarserver_manage_timezones",
+ "bin/calendarserver_migrate_resources",
+ # "bin/calendarserver_monitor_amp_notifications",
+ # "bin/calendarserver_monitor_notifications",
+ "bin/calendarserver_purge_attachments",
+ "bin/calendarserver_purge_events",
+ "bin/calendarserver_purge_principals",
+ "bin/calendarserver_shell",
+ "bin/calendarserver_upgrade",
+ # "bin/calendarserver_verify_data",
+ ],
</ins><span class="cx"> data_files=[("caldavd", ["conf/caldavd.plist"]), ],
</span><span class="cx"> ext_modules=extensions,
</span><span class="cx"> py_modules=[],
</span><span class="lines">@@ -177,7 +182,9 @@
</span><span class="cx"> install_lib = install_lib[len(root):]
</span><span class="cx">
</span><span class="cx"> for script in dist.scripts:
</span><del>- scriptPath = os.path.join(install_scripts, os.path.basename(script))
</del><ins>+ scriptPath = os.path.join(
+ install_scripts, os.path.basename(script)
+ )
</ins><span class="cx">
</span><span class="cx"> print("rewriting {0}".format(scriptPath))
</span><span class="cx">
</span><span class="lines">@@ -196,17 +203,29 @@
</span><span class="cx"> line = line.rstrip("\n")
</span><span class="cx"> if fileType == "sh":
</span><span class="cx"> if line == "#PYTHONPATH":
</span><del>- script.append('PYTHONPATH="{add}:$PYTHONPATH"'.format(add=install_lib))
</del><ins>+ script.append(
+ 'PYTHONPATH="{add}:$PYTHONPATH"'
+ .format(add=install_lib)
+ )
</ins><span class="cx"> elif line == "#PATH":
</span><del>- script.append('PATH="{add}:$PATH"'.format(add=os.path.join(base, "usr", "bin")))
</del><ins>+ script.append(
+ 'PATH="{add}:$PATH"'
+ .format(add=os.path.join(base, "usr", "bin"))
+ )
</ins><span class="cx"> else:
</span><span class="cx"> script.append(line)
</span><span class="cx">
</span><span class="cx"> elif fileType == "python":
</span><span class="cx"> if line == "#PYTHONPATH":
</span><del>- script.append('PYTHONPATH="{path}"'.format(path=install_lib))
</del><ins>+ script.append(
+ 'PYTHONPATH="{path}"'
+ .format(path=install_lib)
+ )
</ins><span class="cx"> elif line == "#PATH":
</span><del>- script.append('PATH="{path}"'.format(path=os.path.join(base, "usr", "bin")))
</del><ins>+ script.append(
+ 'PATH="{path}"'
+ .format(path=os.path.join(base, "usr", "bin"))
+ )
</ins><span class="cx"> else:
</span><span class="cx"> script.append(line)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>