<!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>[12967] 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/12967">12967</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 18:26:08 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start work on caching depenencies for B&I.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupport_cache_deps">CalendarServer/trunk/support/_cache_deps</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 (12966 => 12967)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2014-03-19 01:04:41 UTC (rev 12966)
+++ CalendarServer/trunk/bin/_build.sh 2014-03-19 01:26:08 UTC (rev 12967)
</span><span class="lines">@@ -579,6 +579,16 @@
</span><span class="cx"> export PYTHON="${python}";
</span><span class="cx"> export PYTHONPATH="${wd}:${PYTHONPATH:-}";
</span><span class="cx">
</span><ins>+ # Work around a change in Xcode tools that breaks Python modules in OS X
+ # 10.9.2 and prior due to a hard error if the -mno-fused-madd is used, as
+ # it was in the system Python, and is therefore passed along by disutils.
+ if [ "$(uname -s)" == "Darwin" ]; then
+ if "${python}" -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("CFLAGS")' \
+ | grep -e -mno-fused-madd > /dev/null; then
+ export ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future";
+ fi;
+ fi;
+
</ins><span class="cx"> if ! "${do_setup}"; then return 0; fi;
</span><span class="cx">
</span><span class="cx"> # Set up virtual environment
</span><span class="lines">@@ -594,14 +604,10 @@
</span><span class="cx">
</span><span class="cx"> "${python}" "${wd}/setup.py" check > /dev/null;
</span><span class="cx">
</span><del>- # Work around a change in Xcode tools that breaks Python modules in OS X
- # 10.9.2 and prior due to a hard error if the -mno-fused-madd is used, as
- # it was in the system Python, and is therefore passed along by disutils.
- if [ "$(uname -s)" == "Darwin" ]; then
- if "${python}" -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("CFLAGS")' \
- | grep -e -mno-fused-madd > /dev/null; then
- export ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future";
- fi;
</del><ins>+ if [ -d "${wd}/requirements/cache" ]; then
+ pip_install="pip_install_from_cache";
+ else
+ pip_install="pip_install";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> for requirements in "${wd}/requirements/py_"*".txt"; do
</span><span class="lines">@@ -609,11 +615,7 @@
</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
</del><ins>+ if ! "${pip_install}" "${requirements}"; then
</ins><span class="cx"> err=$?;
</span><span class="cx"> echo "Unable to set up Python requirements: ${requirements}";
</span><span class="cx"> if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
</span><span class="lines">@@ -631,7 +633,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+pip_install_from_cache () {
+ local requirements="$1"; shift;
</ins><span class="cx">
</span><ins>+ "${python}" -m pip install \
+ --requirement="${requirements}" \
+ --find-links "${wd}/requirements/cache" \
+ --no-index \
+ --log="${dev_home}/pip.log";
+}
+
+
+pip_install () {
+ local requirements="$1"; shift;
+
+ "${python}" -m pip install \
+ --requirement="${requirements}" \
+ --download-cache="${dev_home}/pip_cache" \
+ --log="${dev_home}/pip.log";
+}
+
+
</ins><span class="cx"> #
</span><span class="cx"> # Set up for development
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServertrunksupport_cache_deps"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/support/_cache_deps (0 => 12967)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/_cache_deps (rev 0)
+++ CalendarServer/trunk/support/_cache_deps 2014-03-19 01:26:08 UTC (rev 12967)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+#!/bin/sh
+# -*- sh-basic-offset: 2 -*-
+
+##
+# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+set -e
+set -u
+
+wd="$(cd "$(dirname "$0")/.." && pwd)";
+
+. "${wd}/bin/_build.sh";
+
+do_setup="false";
+
+develop > /dev/null;
+
+mkdir "${wd}/requirements/cache";
+
+find "${wd}/requirements" -type f -name "py_*.txt" | while read requirements; do
+ case "${requirements}" in
+ */py_opt_OpenDirectory.txt) download=false; ;;
+ */py_opt_Oracle.txt) download=false; ;;
+ *) download=true; ;;
+ esac;
+
+ if "${download}"; then
+ echo "Downloading requirements from: ${requirements}";
+
+ "${python}" -m pip install --download "${wd}/requirements/cache" --requirement "${requirements}";
+ fi;
+done;
</ins><span class="cx">Property changes on: CalendarServer/trunk/support/_cache_deps
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
</div>
</body>
</html>