<!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>[13256] 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/13256">13256</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-10 17:05:17 -0700 (Thu, 10 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add pip_download().
Rename ${py_modules} -> ${py_virtualenv}.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunksupportApplemake">CalendarServer/trunk/support/Apple.make</a></li>
<li><a href="#CalendarServertrunksupportsubmit">CalendarServer/trunk/support/submit</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 (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh        2014-04-11 00:04:37 UTC (rev 13255)
+++ CalendarServer/trunk/bin/_build.sh        2014-04-11 00:05:17 UTC (rev 13256)
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx"> dep_packages="${dev_home}/pkg";
</span><span class="cx"> dep_sources="${dev_home}/src";
</span><span class="cx">
</span><del>- py_root="${dev_roots}/py_modules";
- py_libdir="${py_root}/lib/python";
- py_bindir="${py_root}/bin";
</del><ins>+ py_virtualenv="${dev_home}/virtualenv";
+ py_libdir="${py_virtualenv}/lib/python";
+ py_bindir="${py_virtualenv}/bin";
</ins><span class="cx">
</span><span class="cx"> python="${py_bindir}/python";
</span><span class="cx">
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx"> dep_packages="${TWEXT_PKG_CACHE}";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- if [ ! -d "${py_root}" ]; then
- "${bootstrap_python}" -m virtualenv "${py_root}";
</del><ins>+ if [ ! -d "${py_virtualenv}" ]; then
+ "${bootstrap_python}" -m virtualenv "${py_virtualenv}";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> project="$(setup_print name)";
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx"> # Build Python dependencies
</span><span class="cx"> #
</span><span class="cx"> py_dependencies () {
</span><del>- export PATH="${py_root}/bin:${PATH}";
</del><ins>+ export PATH="${py_virtualenv}/bin:${PATH}";
</ins><span class="cx"> export PYTHON="${python}";
</span><span class="cx"> export PYTHONPATH="${wd}:${PYTHONPATH:-}";
</span><span class="cx">
</span><span class="lines">@@ -611,10 +611,10 @@
</span><span class="cx">
</span><span class="cx"> if "${force_setup}"; then
</span><span class="cx"> # Nuke the virtual environment first
</span><del>- rm -rf "${py_root}";
</del><ins>+ rm -rf "${py_virtualenv}";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><del>- "${bootstrap_python}" -m virtualenv "${py_root}";
</del><ins>+ "${bootstrap_python}" -m virtualenv "${py_virtualenv}";
</ins><span class="cx">
</span><span class="cx"> # Make sure setup got called enough to write the version file.
</span><span class="cx">
</span><span class="lines">@@ -626,16 +626,14 @@
</span><span class="cx"> pip_install="pip_download_and_install";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- local requirements="${wd}/requirements.txt";
-
</del><span class="cx"> ruler "Preparing Python requirements";
</span><span class="cx"> echo "";
</span><del>- "${pip_install}" "--requirement=${requirements}";
</del><ins>+ "${pip_install}" --requirement="${wd}/requirements.txt";
</ins><span class="cx">
</span><span class="cx"> for option in $("${python}" -c 'import setup; print "\n".join(setup.extras_requirements.keys())'); do
</span><span class="cx"> ruler "Preparing Python requirements for optional feature: ${option}";
</span><span class="cx"> echo "";
</span><del>- if ! "${pip_install}" "--editable=${wd}[${option}]"; then
</del><ins>+ if ! "${pip_install}" --editable="${wd}[${option}]"; then
</ins><span class="cx"> echo "Feature ${option} is optional; continuing.";
</span><span class="cx"> fi;
</span><span class="cx"> done;
</span><span class="lines">@@ -644,6 +642,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+pip_download () {
+ mkdir -p "${dev_home}/pip_downloads";
+
+ "${python}" -m pip install \
+ --download="${dev_home}/pip_downloads" \
+ --pre --allow-all-external \
+ --log="${dev_home}/pip.log" \
+ "$@";
+}
+
+
</ins><span class="cx"> pip_install_from_cache () {
</span><span class="cx"> "${python}" -m pip install \
</span><span class="cx"> --find-links="${dev_home}/pip_downloads" \
</span><span class="lines">@@ -655,7 +664,8 @@
</span><span class="cx">
</span><span class="cx"> pip_download_and_install () {
</span><span class="cx"> "${python}" -m pip install \
</span><del>- --pre --upgrade \
</del><ins>+ --upgrade \
+ --pre --allow-all-external \
</ins><span class="cx"> --download-cache="${dev_home}/pip_cache" \
</span><span class="cx"> --log="${dev_home}/pip.log" \
</span><span class="cx"> "$@";
</span></span></pre></div>
<a id="CalendarServertrunksupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/Apple.make (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make        2014-04-11 00:04:37 UTC (rev 13255)
+++ CalendarServer/trunk/support/Apple.make        2014-04-11 00:05:17 UTC (rev 13256)
</span><span class="lines">@@ -134,10 +134,10 @@
</span><span class="cx"> #install:: install-ossfiles
</span><span class="cx">
</span><span class="cx"> install-ossfiles::
</span><del>-        $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSV);
-        $(_v) $(INSTALL_FILE) $(Sources)/$(ProjectName).plist $(DSTROOT)/$(OSV)/$(ProjectName).plist;
-        $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSL);
-        $(_v) $(INSTALL_FILE) $(BuildDirectory)/$(Project)/LICENSE $(DSTROOT)/$(OSL)/$(ProjectName).txt;
</del><ins>+        $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSV)";
+        $(_v) $(INSTALL_FILE) "$(Sources)/$(ProjectName).plist" "$(DSTROOT)/$(OSV)/$(ProjectName).plist";
+        $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSL)";
+        $(_v) $(INSTALL_FILE) "$(BuildDirectory)/$(Project)/LICENSE" "$(DSTROOT)/$(OSL)/$(ProjectName).txt";
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # B&I Hooey
</span><span class="lines">@@ -145,8 +145,8 @@
</span><span class="cx">
</span><span class="cx"> cache_deps::
</span><span class="cx">         @echo "Downloading dependencies...";
</span><del>-        $(_v) if [ ! -d requirements/cache ]; then ./support/_cache_deps ]; fi;
</del><ins>+        $(_v) if [ ! -d "$(Sources)/requirements/cache" ]; then "$(Sources)/support/_cache_deps" ]; fi;
</ins><span class="cx">
</span><span class="cx"> buildit: cache_deps
</span><span class="cx">         @echo "Running buildit...";
</span><del>-        $(_v) sudo ~rc/bin/buildit $(CC_Archs) $(Sources);
</del><ins>+        $(_v) sudo ~rc/bin/buildit $(CC_Archs) "$(Sources)";
</ins></span></pre></div>
<a id="CalendarServertrunksupportsubmit"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/submit (13255 => 13256)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/submit        2014-04-11 00:04:37 UTC (rev 13255)
+++ CalendarServer/trunk/support/submit        2014-04-11 00:05:17 UTC (rev 13256)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> echo "Copying ${src}...";
</span><span class="cx"> ignores="$(mktemp -t CalendarServer_ignores)";
</span><span class="cx"> svn st --no-ignore | sed -n -e 's|^I...... ||p' > "${ignores}";
</span><del>- rsync -av --exclude=".svn" --exclude="_trial_temp" --exclude="*.pyc" --exclude="*.so" --exclude-from="${ignores}" "${src}/" "${wc}";
</del><ins>+ rsync -av --exclude=".svn" --exclude-from="${ignores}" "${src}/" "${wc}";
</ins><span class="cx"> rm "${ignores}";
</span><span class="cx"> else
</span><span class="cx"> echo "";
</span><span class="lines">@@ -205,6 +205,7 @@
</span><span class="cx"> fi;
</span><span class="cx"> fi;
</span><span class="cx"> else
</span><ins>+ echo "${wc}"; exit 1;
</ins><span class="cx"> echo "";
</span><span class="cx"> echo "Submitting sources for ${project_version}...";
</span><span class="cx"> rm -rf "${wc}/.dependencies";
</span></span></pre>
</div>
</div>
</body>
</html>