<!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>[12578] CalendarServer/trunk</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/12578">12578</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-05 14:21:13 -0800 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't update deps in tools by default.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunkbinbenchmark">CalendarServer/trunk/bin/benchmark</a></li>
<li><a href="#CalendarServertrunkbinbenchreport">CalendarServer/trunk/bin/benchreport</a></li>
<li><a href="#CalendarServertrunkbinpyflakes">CalendarServer/trunk/bin/pyflakes</a></li>
<li><a href="#CalendarServertrunkbinpython">CalendarServer/trunk/bin/python</a></li>
<li><a href="#CalendarServertrunkbinsim">CalendarServer/trunk/bin/sim</a></li>
<li><a href="#CalendarServertrunkbintest">CalendarServer/trunk/bin/test</a></li>
<li><a href="#CalendarServertrunkbintestserver">CalendarServer/trunk/bin/testserver</a></li>
<li><a href="#CalendarServertrunkbintrial">CalendarServer/trunk/bin/trial</a></li>
<li><a href="#CalendarServertrunkbintwistd">CalendarServer/trunk/bin/twistd</a></li>
<li><a href="#CalendarServertrunkrequirementspy_developtxt">CalendarServer/trunk/requirements/py_develop.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/_build.sh 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -99,6 +99,8 @@
</span><span class="cx"> py_libdir="${py_root}/lib/python";
</span><span class="cx"> py_bindir="${py_root}/bin";
</span><span class="cx">
</span><ins>+ python="${py_bindir}/python";
+
</ins><span class="cx"> if [ -z "${TWEXT_PKG_CACHE-}" ]; then
</span><span class="cx"> dep_packages="${dev_home}/pkg";
</span><span class="cx"> else
</span><span class="lines">@@ -111,6 +113,8 @@
</span><span class="cx"> rm -rf "${py_root}";
</span><span class="cx"> fi;
</span><span class="cx">
</span><ins>+ export PYTHONPATH="${wd}:${PYTHONPATH:-}";
+
</ins><span class="cx"> # These variables are defaults for things which might be configured by
</span><span class="cx"> # environment; only set them if they're un-set.
</span><span class="cx">
</span><span class="lines">@@ -576,8 +580,6 @@
</span><span class="cx">
</span><span class="cx"> "${bootstrap_python}" -m virtualenv "${py_root}";
</span><span class="cx">
</span><del>- python="${py_bindir}/python";
-
</del><span class="cx"> # Make sure setup got called enough to write the version file.
</span><span class="cx">
</span><span class="cx"> "${python}" "${wd}/setup.py" check > /dev/null;
</span></span></pre></div>
<a id="CalendarServertrunkbinbenchmark"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/benchmark (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/benchmark 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/benchmark 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -19,8 +19,12 @@
</span><span class="cx"> set -e;
</span><span class="cx"> set -u;
</span><span class="cx">
</span><del>-wd="$(cd "$(dirname "$0")" && pwd -L)";
</del><ins>+wd="$(cd "$(dirname "$0")/.." && pwd -L)";
</ins><span class="cx">
</span><del>-export PYTHONPATH="$("${wd}/run" -p)";
</del><ins>+export _DEVELOP="true";
</ins><span class="cx">
</span><del>-exec "${wd}/contrib/performance/benchmark" "$@";
</del><ins>+. "${wd}/bin/_build.sh";
+
+init_build > /dev/null;
+
+exec "${python}" "${wd}/contrib/performance/benchmark" "$@";
</ins></span></pre></div>
<a id="CalendarServertrunkbinbenchreport"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/benchreport (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/benchreport 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/benchreport 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -19,17 +19,21 @@
</span><span class="cx"> set -e;
</span><span class="cx"> set -u;
</span><span class="cx">
</span><del>-wd="$(cd "$(dirname "$0")" && pwd -L)";
</del><ins>+wd="$(cd "$(dirname "$0")/.." && pwd -L)";
</ins><span class="cx">
</span><del>-export PYTHONPATH="$("${wd}/run" -p):${wd}/../CalDAVClientLibrary/src";
</del><ins>+export _DEVELOP="true";
</ins><span class="cx">
</span><ins>+. "${wd}/bin/_build.sh";
+
+init_build > /dev/null;
+
</ins><span class="cx"> args="$@"
</span><span class="cx">
</span><span class="cx"> echo "Parameter: 1";
</span><del>-"${wd}/contrib/performance/report" ${args} 1 HTTP summarize;
</del><ins>+"${python}" "${wd}/contrib/performance/report" ${args} 1 HTTP summarize;
</ins><span class="cx"> echo;
</span><span class="cx"> echo "Parameter: 9";
</span><del>-"${wd}/contrib/performance/report" ${args} 9 HTTP summarize;
</del><ins>+"${python}" "${wd}/contrib/performance/report" ${args} 9 HTTP summarize;
</ins><span class="cx"> echo;
</span><span class="cx"> echo "Parameter: 81";
</span><del>-"${wd}/contrib/performance/report" ${args} 81 HTTP summarize;
</del><ins>+"${python}" "${wd}/contrib/performance/report" ${args} 81 HTTP summarize;
</ins></span></pre></div>
<a id="CalendarServertrunkbinpyflakes"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/pyflakes (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/pyflakes 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/pyflakes 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -31,7 +31,5 @@
</span><span class="cx"> set - calendarserver contrib twisted twistedcaldav txdav txweb2;
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>-"${python}" -m pip install pyflakes --upgrade >> "${dev_home}/setup.log";
-
</del><span class="cx"> echo "Checking modules:" "$@";
</span><span class="cx"> exec "${python}" -m pyflakes "$@";
</span></span></pre></div>
<a id="CalendarServertrunkbinpython"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/python (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/python 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/python 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -28,7 +28,5 @@
</span><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span><del>-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
</del><span class="cx">
</span><span class="cx"> exec "${python}" "$@";
</span></span></pre></div>
<a id="CalendarServertrunkbinsim"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/sim (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/sim 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/sim 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -19,10 +19,12 @@
</span><span class="cx"> set -e;
</span><span class="cx"> set -u;
</span><span class="cx">
</span><del>-wd="$(cd "$(dirname "$0")" && pwd -L)";
</del><ins>+wd="$(cd "$(dirname "$0")/.." && pwd -L)";
</ins><span class="cx">
</span><del>-source "${wd}/support/shell.sh";
</del><ins>+export _DEVELOP="true";
</ins><span class="cx">
</span><del>-export PYTHONPATH="$("${wd}/run" -p)";
</del><ins>+. "${wd}/bin/_build.sh";
</ins><span class="cx">
</span><del>-exec "${wd}/contrib/performance/sim" "$@";
</del><ins>+init_build > /dev/null;
+
+exec "${python}" "${wd}/contrib/performance/sim" "$@";
</ins></span></pre></div>
<a id="CalendarServertrunkbintest"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/test (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/test 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/test 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -97,8 +97,8 @@
</span><span class="cx"> # Dependencies
</span><span class="cx"> #
</span><span class="cx">
</span><del>-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
</del><ins>+#c_dependencies >> "${dev_home}/setup.log";
+#py_dependencies >> "${dev_home}/setup.log";
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkbintestserver"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/testserver (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/testserver 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/testserver 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -16,20 +16,30 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-wd="$(cd "$(dirname "$0")/.." && pwd)";
-cdt="${wd}/../CalDAVTester";
</del><ins>+set -e;
+set -u;
</ins><span class="cx">
</span><ins>+wd="$(cd "$(dirname "$0")/.." && pwd -L)";
+
+export _DEVELOP="true";
+
+. "${wd}/bin/_build.sh";
+
+init_build > /dev/null;
+
+cdt="${py_root}/src/caldavtester";
+
</ins><span class="cx"> ##
</span><span class="cx"> # Command line handling
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-verbose="";
</del><ins>+ verbose="";
</ins><span class="cx"> serverinfo="${cdt}/scripts/server/serverinfo.xml";
</span><del>-printres="";
-subdir="";
-random="--random";
-seed="";
-ssl="";
</del><ins>+ printres="";
+ subdir="";
+ random="--random";
+ seed="";
+ ssl="";
</ins><span class="cx">
</span><span class="cx"> usage ()
</span><span class="cx"> {
</span><span class="lines">@@ -75,7 +85,5 @@
</span><span class="cx"> # Do The Right Thing
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-source "${wd}/support/shell.sh";
-
</del><span class="cx"> cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkbintrial"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/trial (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/trial 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/trial 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -26,7 +26,5 @@
</span><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span><del>-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
</del><span class="cx">
</span><span class="cx"> exec "${py_bindir}/trial" "$@";
</span></span></pre></div>
<a id="CalendarServertrunkbintwistd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/twistd (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/twistd 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/twistd 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -26,7 +26,5 @@
</span><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span><del>-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
</del><span class="cx">
</span><span class="cx"> exec "${py_bindir}/twistd" "$@";
</span></span></pre></div>
<a id="CalendarServertrunkrequirementspy_developtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements/py_develop.txt (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/py_develop.txt 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/requirements/py_develop.txt 2014-02-05 22:21:13 UTC (rev 12578)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><ins>+pyflakes
</ins><span class="cx"> docutils>=0.11
</span><span class="cx">
</span><del>-# Simulator
</del><ins>+-e svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk#egg=CalDAVClientLibrary
</ins><span class="cx">
</span><del>--e svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk#egg=caldavclientlibrary
</del><ins>+-e svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk#egg=CalDAVTester
</ins></span></pre>
</div>
</div>
</body>
</html>