<!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>[12462] 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/12462">12462</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-28 10:51:57 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix up force_setup.</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 (12461 => 12462)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2014-01-28 18:39:51 UTC (rev 12461)
+++ CalendarServer/trunk/bin/_build.sh 2014-01-28 18:51:57 UTC (rev 12462)
</span><span class="lines">@@ -101,6 +101,10 @@
</span><span class="cx">
</span><span class="cx"> mkdir -p "${dep_sources}";
</span><span class="cx">
</span><ins>+ if "${force_setup}"; then
+ rm -rf "${py_root}";
+ fi;
+
</ins><span class="cx"> # Set up virtual environment
</span><span class="cx">
</span><span class="cx"> "${bootstrap_python}" -m virtualenv "${py_root}";
</span><span class="lines">@@ -176,7 +180,10 @@
</span><span class="cx"> local path="$1"; shift;
</span><span class="cx"> local url="$1"; shift;
</span><span class="cx">
</span><del>- if "${force_setup}" || [ ! -d "${path}" ]; then
</del><ins>+ if "${force_setup}"; then
+ rm -rf "${path}";
+ fi;
+ if [ ! -d "${path}" ]; then
</ins><span class="cx"> local ext="$(echo "${url}" | sed 's|^.*\.\([^.]*\)$|\1|')";
</span><span class="cx">
</span><span class="cx"> untar () { tar -xvf -; }
</span><span class="lines">@@ -429,7 +436,10 @@
</span><span class="cx"> export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
</span><span class="cx">
</span><span class="cx"> if "${do_setup}"; then
</span><del>- if "${force_setup}" || [ ! -d "${dstroot}" ]; then
</del><ins>+ if "${force_setup}"; then
+ rm -rf "${dstroot}";
+ fi;
+ if [ ! -d "${dstroot}" ]; then
</ins><span class="cx"> echo "Building ${name}...";
</span><span class="cx"> cd "${srcdir}";
</span><span class="cx"> ./configure --prefix="${dstroot}" "$@";
</span><span class="lines">@@ -554,19 +564,21 @@
</span><span class="cx"> ruler "Preparing Python requirements: ${requirements}";
</span><span class="cx"> echo "";
</span><span class="cx">
</span><del>- if ! "${python}" -m pip install \
- --requirement "${requirements}" \
- --download-cache "${dev_home}/pip_cache" \
- --log "${dev_home}/pip.log" \
- ; then
- err=$?;
- echo "Unable to set up Python requirements: ${requirements}";
- if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
- echo "Requirements ${requirements} are optional; continuing.";
- else
- echo "";
- echo "pip log: ${dev_home}/pip.log";
- return 1;
</del><ins>+ if "${do_setup}"; then
+ if ! "${python}" -m pip install \
+ --requirement "${requirements}" \
+ --download-cache "${dev_home}/pip_cache" \
+ --log "${dev_home}/pip.log" \
+ ; then
+ err=$?;
+ echo "Unable to set up Python requirements: ${requirements}";
+ if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
+ echo "Requirements ${requirements} are optional; continuing.";
+ else
+ echo "";
+ echo "pip log: ${dev_home}/pip.log";
+ return 1;
+ fi;
</ins><span class="cx"> fi;
</span><span class="cx"> fi;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>