<!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>[13743] CalendarServer/trunk/bin/_build.sh</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/13743">13743</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 14:58:29 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve ve bootstrapping.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</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 (13742 => 13743)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh        2014-07-09 21:57:26 UTC (rev 13742)
+++ CalendarServer/trunk/bin/_build.sh        2014-07-09 21:58:29 UTC (rev 13743)
</span><span class="lines">@@ -568,11 +568,13 @@
</span><span class="cx"> #
</span><span class="cx"> py_dependencies () {
</span><span class="cx"> python="${py_bindir}/python";
</span><ins>+ py_ve_tools="${dev_home}/ve_tools";
</ins><span class="cx">
</span><span class="cx"> export PATH="${py_virtualenv}/bin:${PATH}";
</span><span class="cx"> export PYTHON="${python}";
</span><del>- export PYTHONPATH="${wd}:${PYTHONPATH:-}";
</del><ins>+ export PYTHONPATH="${py_ve_tools}/lib:${wd}:${PYTHONPATH:-}";
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # Work around a change in Xcode tools that breaks Python modules in OS X
</span><span class="cx"> # 10.9.2 and prior due to a hard error if the -mno-fused-madd is used, as
</span><span class="cx"> # it was in the system Python, and is therefore passed along by disutils.
</span><span class="lines">@@ -601,7 +603,7 @@
</span><span class="cx">
</span><span class="cx"> # Make sure setup got called enough to write the version file.
</span><span class="cx">
</span><del>- "${python}" "${wd}/setup.py" check > /dev/null;
</del><ins>+ PYTHONPATH="${PYTHONPATH}" "${python}" "${wd}/setup.py" check > /dev/null;
</ins><span class="cx">
</span><span class="cx"> if [ -d "${dev_home}/pip_downloads" ]; then
</span><span class="cx"> pip_install="pip_install_from_cache";
</span><span class="lines">@@ -626,24 +628,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> bootstrap_virtualenv () {
</span><del>- py_ve_tools="${dev_home}/ve_tools";
-
- if [ -d "${py_ve_tools}/lib" ]; then
- export PYTHONPATH="${py_ve_tools}/lib:${PYTHONPATH:-}";
- fi;
-
- if "${bootstrap_python}" -m virtualenv > /dev/null 2>&1; then
- return 0;
- fi;
-
</del><span class="cx"> mkdir -p "${py_ve_tools}";
</span><span class="cx"> mkdir -p "${py_ve_tools}/lib";
</span><span class="cx"> mkdir -p "${py_ve_tools}/junk";
</span><span class="cx">
</span><span class="cx"> for pkg in \
</span><del>- pip-1.5.4 \
- virtualenv-1.11.4 \
- setuptools-3.4.4 \
</del><ins>+ setuptools-5.4.1 \
+ pip-1.5.6 \
+ virtualenv-1.11.6 \
</ins><span class="cx"> ; do
</span><span class="cx"> name="${pkg%-*}";
</span><span class="cx"> version="${pkg#*-}";
</span><span class="lines">@@ -669,8 +661,6 @@
</span><span class="cx">
</span><span class="cx"> rm -rf "${tmp}";
</span><span class="cx"> done;
</span><del>-
- export PYTHONPATH="${py_ve_tools}/lib:${PYTHONPATH:-}";
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>