<!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>[13377] 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/13377">13377</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-28 16:39:50 -0700 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build virtualenv when needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupportApplemake">CalendarServer/trunk/support/Apple.make</a></li>
<li><a href="#CalendarServertrunksupport_cache_deps">CalendarServer/trunk/support/_cache_deps</a></li>
<li><a href="#CalendarServertrunksupportsubmit">CalendarServer/trunk/support/submit</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/Apple.make (13376 => 13377)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make 2014-04-28 23:39:32 UTC (rev 13376)
+++ CalendarServer/trunk/support/Apple.make 2014-04-28 23:39:50 UTC (rev 13377)
</span><span class="lines">@@ -69,22 +69,43 @@
</span><span class="cx"> install:: install-python
</span><span class="cx"> install-python:: build
</span><span class="cx"> @#
</span><ins>+ @# Install virtualenv someplace and put it in PYTHONPATH in case it's not
+ @# on the host system.
+ @#
+ @echo "Installing virtualenv and friends...";
+ $(_v) mkdir -p "$(BuildDirectory)/pytools";
+ $(_v) mkdir -p "$(BuildDirectory)/pytools/lib";
+ $(_v) mkdir -p "$(BuildDirectory)/pytools/junk";
+ $(_v) for pkg in $$(find "$(Sources)/.develop/tools" -type f -name "*.tgz"); do \
+ tar -C "$(BuildDirectory)" -xvzf "$${pkg}"; \
+ cd "$(BuildDirectory)/$$(basename "$${pkg}" .tgz)" && \
+ PYTHONPATH="$(BuildDirectory)/pytools/lib" \
+ "$(PYTHON)" setup.py install \
+ --install-base="$(BuildDirectory)/pytools" \
+ --install-lib="$(BuildDirectory)/pytools/lib" \
+ --install-headers="$(BuildDirectory)/pytools/junk" \
+ --install-scripts="$(BuildDirectory)/pytools/junk" \
+ --install-data="$(BuildDirectory)/pytools/junk" \
+ ; \
+ done;
+ @#
</ins><span class="cx"> @# Set up a virtual environment in Server.app; we'll install into that.
</span><span class="cx"> @# Use --system-site-packages so that we use the packages provided by the OS.
</span><span class="cx"> @#
</span><span class="cx"> @echo "Creating virtual environment...";
</span><span class="cx"> $(_v) $(RMDIR) "$(DSTROOT)$(CS_VIRTUALENV)";
</span><del>- $(_v) $(PYTHON) -m virtualenv --system-site-packages "$(DSTROOT)$(CS_VIRTUALENV)";
</del><ins>+ $(_v) PYTHONPATH="$(BuildDirectory)/pytools/lib" \
+ "$(PYTHON)" -m virtualenv --system-site-packages "$(DSTROOT)$(CS_VIRTUALENV)";
</ins><span class="cx"> @#
</span><span class="cx"> @# Use the pip in the virtual environment to install.
</span><span class="cx"> @# It knows about where things go in the virtual environment.
</span><span class="cx"> @#
</span><span class="cx"> @echo "Installing Python packages...";
</span><span class="cx"> $(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \
</span><del>- $(Environment) "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \
- --pre --allow-all-external --no-index --no-deps \
- --log=/tmp/pip.log \
- "$${pkg}"; \
</del><ins>+ $(Environment) "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \
+ --pre --allow-all-external --no-index --no-deps \
+ --log=/tmp/pip.log \
+ "$${pkg}"; \
</ins><span class="cx"> done;
</span><span class="cx"> @#
</span><span class="cx"> @# Make the virtualenv relocatable
</span></span></pre></div>
<a id="CalendarServertrunksupport_cache_deps"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/_cache_deps (13376 => 13377)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/_cache_deps 2014-04-28 23:39:32 UTC (rev 13376)
+++ CalendarServer/trunk/support/_cache_deps 2014-04-28 23:39:50 UTC (rev 13377)
</span><span class="lines">@@ -31,6 +31,33 @@
</span><span class="cx"> requirements="${wd}/requirements-apple.txt";
</span><span class="cx"> extra_features="OpenDirectory,Postgres";
</span><span class="cx">
</span><ins>+
+#
+# Download virtualenv and friends.
+#
+
+mkdir -p "${wd}/.develop/tools";
+
+for pkg in \
+ pip-1.5.4 \
+ virtualenv-1.11.4 \
+ setuptools-3.4.4 \
+; do
+ name="${pkg%-*}";
+ version="${pkg#*-}";
+ first="$(echo "${name}" | sed 's|^\(.\).*$|\1|')";
+ url="https://pypi.python.org/packages/source/${first}/${name}/${pkg}.tar.gz";
+
+ ruler "Downloading ${pkg}";
+
+ curl -L -o "${wd}/.develop/tools/${pkg}.tgz" "${url}";
+done;
+
+
+#
+# Download dependencies
+#
+
</ins><span class="cx"> ruler "Downloading Python requirements for .[${extra_features}]";
</span><span class="cx"> echo "";
</span><span class="cx"> pip_download \
</span></span></pre></div>
<a id="CalendarServertrunksupportsubmit"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/submit (13376 => 13377)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/submit 2014-04-28 23:39:32 UTC (rev 13376)
+++ CalendarServer/trunk/support/submit 2014-04-28 23:39:50 UTC (rev 13377)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> "${wc}/support/_cache_deps";
</span><span class="cx">
</span><span class="cx"> # Clean up after _cache_deps
</span><del>-find "${wc}/.develop" -depth 1 ! -name pip_downloads -print0 | xargs -0 rm -r;
</del><ins>+find "${wc}/.develop" -depth 1 ! '(' -name pip_downloads -o -name tools ')' -print0 | xargs -0 rm -r;
</ins><span class="cx">
</span><span class="cx"> if "${build}"; then
</span><span class="cx"> echo "";
</span></span></pre>
</div>
</div>
</body>
</html>