<!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>[13115] twext/trunk/bin</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/13115">13115</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-01 18:16:23 -0700 (Tue, 01 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sync tools</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunkbin_buildsh">twext/trunk/bin/_build.sh</a></li>
<li><a href="#twexttrunkbin_pysh">twext/trunk/bin/_py.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/_build.sh (13114 => 13115)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/_build.sh 2014-04-02 01:15:29 UTC (rev 13114)
+++ twext/trunk/bin/_build.sh 2014-04-02 01:16:23 UTC (rev 13115)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> # Check for presence of a header of specified version
</span><span class="cx"> local found_version="$(printf "#include <${sys_header}>\n${version_macro}\n" | cc -x c -E - | tail -1)";
</span><span class="cx">
</span><del>- if [ "${found_version}" == "${version_macro}" ]; then
</del><ins>+ if [ "${found_version}" = "${version_macro}" ]; then
</ins><span class="cx"> # Macro was not replaced
</span><span class="cx"> return 1;
</span><span class="cx"> fi;
</span><span class="lines">@@ -135,9 +135,9 @@
</span><span class="cx"> sha1 () { "$(type -p shasum)" "$@"; }
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- if [ "${hash}" == "sha1" ]; then
</del><ins>+ if [ "${hash}" = "sha1" ]; then
</ins><span class="cx"> hash () { sha1 "$@"; }
</span><del>- elif [ "${hash}" == "md5" ]; then
</del><ins>+ elif [ "${hash}" = "md5" ]; then
</ins><span class="cx"> hash () { md5 "$@"; }
</span><span class="cx"> elif type -t cksum > /dev/null; then
</span><span class="cx"> hash="hash";
</span><span class="lines">@@ -497,9 +497,13 @@
</span><span class="cx"> using_system "libffi";
</span><span class="cx"> fi;
</span><span class="cx"> else
</span><ins>+ local v="3.0.13";
+ local n="libffi";
+ local p="${n}-${v}";
+
</ins><span class="cx"> c_dependency -m "45f3b6dbc9ee7c7dfbbbc5feba571529" \
</span><del>- "libffi" "libffi-3.0.13" \
- "ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz"
</del><ins>+ "libffi" "${p}" \
+ "ftp://sourceware.org/pub/libffi/${p}.tar.gz"
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> ruler;
</span><span class="lines">@@ -509,6 +513,7 @@
</span><span class="cx"> local v="2.4.38";
</span><span class="cx"> local n="openldap";
</span><span class="cx"> local p="${n}-${v}";
</span><ins>+
</ins><span class="cx"> c_dependency -m "39831848c731bcaef235a04e0d14412f" \
</span><span class="cx"> "OpenLDAP" "${p}" \
</span><span class="cx"> "http://www.openldap.org/software/download/OpenLDAP/${n}-release/${p}.tgz" \
</span><span class="lines">@@ -528,6 +533,7 @@
</span><span class="cx"> local v="2.1.26";
</span><span class="cx"> local n="cyrus-sasl";
</span><span class="cx"> local p="${n}-${v}";
</span><ins>+
</ins><span class="cx"> c_dependency -m "a7f4e5e559a0e37b3ffc438c9456e425" \
</span><span class="cx"> "Cyrus SASL" "${p}" \
</span><span class="cx"> "ftp://ftp.cyrusimap.org/cyrus-sasl/${p}.tar.gz" \
</span><span class="lines">@@ -538,14 +544,21 @@
</span><span class="cx"> if type -P memcached > /dev/null; then
</span><span class="cx"> using_system "memcached";
</span><span class="cx"> else
</span><del>- local le="libevent-2.0.21-stable";
- local mc="memcached-1.4.16";
</del><ins>+ local v="2.0.21-stable";
+ local n="libevent";
+ local p="${n}-${v}";
+
</ins><span class="cx"> c_dependency -m "b2405cc9ebf264aa47ff615d9de527a2" \
</span><del>- "libevent" "${le}" \
- "http://github.com/downloads/libevent/libevent/${le}.tar.gz";
</del><ins>+ "libevent" "${p}" \
+ "http://github.com/downloads/libevent/libevent/${p}.tar.gz";
+
+ local v="1.4.16";
+ local n="memcached";
+ local p="${n}-${v}";
+
</ins><span class="cx"> c_dependency -m "1c5781fecb52d70b615c6d0c9c140c9c" \
</span><del>- "memcached" "${mc}" \
- "http://www.memcached.org/files/${mc}.tar.gz";
</del><ins>+ "memcached" "${p}" \
+ "http://www.memcached.org/files/${p}.tar.gz";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> ruler;
</span><span class="lines">@@ -579,6 +592,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 +617,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 +628,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 +646,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="twexttrunkbin_pysh"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/_py.sh (13114 => 13115)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/_py.sh 2014-04-02 01:15:29 UTC (rev 13114)
+++ twext/trunk/bin/_py.sh 2014-04-02 01:16:23 UTC (rev 13115)
</span><span class="lines">@@ -109,13 +109,13 @@
</span><span class="cx"> break;
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- if [ "${v}" == "${v#*.}" ]; then
</del><ins>+ if [ "${v}" = "${v#*.}" ]; then
</ins><span class="cx"> # No dots left, so we're ok
</span><span class="cx"> result=0;
</span><span class="cx"> break;
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- if [ "${mv}" == "${mv#*.}" ]; then
</del><ins>+ if [ "${mv}" = "${mv#*.}" ]; then
</ins><span class="cx"> # No dots left, so we're not gonna match
</span><span class="cx"> result=1;
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>