<!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>[12460] twext/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/12460">12460</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-28 10:32:52 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Back-port _build from CS</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunkbin_buildsh">twext/trunk/bin/_build.sh</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#twexttrunkrequirementspy_basetxt">twext/trunk/requirements/py_base.txt</a></li>
<li><a href="#twexttrunkrequirementspy_developtxt">twext/trunk/requirements/py_develop.txt</a></li>
<li><a href="#twexttrunkrequirementspy_opt_DALtxt">twext/trunk/requirements/py_opt_DAL.txt</a></li>
<li><a href="#twexttrunkrequirementspy_opt_LDAPtxt">twext/trunk/requirements/py_opt_LDAP.txt</a></li>
<li><a href="#twexttrunkrequirementspy_opt_Oracletxt">twext/trunk/requirements/py_opt_Oracle.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#twexttrunkrequirementsbasetxt">twext/trunk/requirements/base.txt</a></li>
<li><a href="#twexttrunkrequirementsdeveloptxt">twext/trunk/requirements/develop.txt</a></li>
<li><a href="#twexttrunkrequirementsopt_DALtxt">twext/trunk/requirements/opt_DAL.txt</a></li>
<li><a href="#twexttrunkrequirementsopt_LDAPtxt">twext/trunk/requirements/opt_LDAP.txt</a></li>
<li><a href="#twexttrunkrequirementsopt_Oracletxt">twext/trunk/requirements/opt_Oracle.txt</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 (12459 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/_build.sh        2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/bin/_build.sh        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -86,25 +86,26 @@
</span><span class="cx"> init_build () {
</span><span class="cx"> init_py;
</span><span class="cx">
</span><del>- verbose="";
</del><span class="cx"> do_get="true";
</span><span class="cx"> do_setup="true";
</span><span class="cx"> force_setup="false";
</span><span class="cx">
</span><span class="cx"> dev_home="${wd}/.develop";
</span><del>- dev_root="${dev_home}/root";
- dev_libdir="${dev_root}/lib/python";
- dev_bindir="${dev_root}/bin";
</del><ins>+ dev_roots="${dev_home}/roots";
</ins><span class="cx"> dep_packages="${dev_home}/pkg";
</span><span class="cx"> dep_sources="${dev_home}/src";
</span><span class="cx">
</span><ins>+ py_root="${dev_roots}/py_modules";
+ py_libdir="${py_root}/lib/python";
+ py_bindir="${py_root}/bin";
+
</ins><span class="cx"> mkdir -p "${dep_sources}";
</span><span class="cx">
</span><span class="cx"> # Set up virtual environment
</span><span class="cx">
</span><del>- "${bootstrap_python}" -m virtualenv "${dev_root}";
</del><ins>+ "${bootstrap_python}" -m virtualenv "${py_root}";
</ins><span class="cx">
</span><del>- python="${dev_bindir}/python";
</del><ins>+ python="${py_bindir}/python";
</ins><span class="cx">
</span><span class="cx"> # These variables are defaults for things which might be configured by
</span><span class="cx"> # environment; only set them if they're un-set.
</span><span class="lines">@@ -415,7 +416,7 @@
</span><span class="cx">
</span><span class="cx"> srcdir="${dep_sources}/${path}";
</span><span class="cx"> # local dstroot="${srcdir}/_root";
</span><del>- local dstroot="${dev_root}";
</del><ins>+ local dstroot="${dev_roots}/${name}";
</ins><span class="cx">
</span><span class="cx"> www_get ${f_hash} "${name}" "${srcdir}" "${uri}";
</span><span class="cx">
</span><span class="lines">@@ -457,13 +458,17 @@
</span><span class="cx"> # Build C dependencies
</span><span class="cx"> #
</span><span class="cx"> c_dependencies () {
</span><ins>+ c_glue_root="${dev_roots}/c_glue";
+ c_glue_include="${c_glue_root}/include";
</ins><span class="cx">
</span><ins>+ export C_INCLUDE_PATH="${c_glue_include}:${C_INCLUDE_PATH:-}";
+
</ins><span class="cx"> ruler;
</span><span class="cx"> if find_header ffi.h; then
</span><span class="cx"> using_system "libffi";
</span><span class="cx"> elif find_header ffi/ffi.h; then
</span><del>- mkdir -p "${dev_root}/include";
- echo "#include <ffi/ffi.h>" > "${dev_root}/include/ffi.h"
</del><ins>+ mkdir -p "${c_glue_include}";
+ echo "#include <ffi/ffi.h>" > "${c_glue_include}/ffi.h"
</ins><span class="cx"> using_system "libffi";
</span><span class="cx"> else
</span><span class="cx"> c_dependency -m "45f3b6dbc9ee7c7dfbbbc5feba571529" \
</span><span class="lines">@@ -485,11 +490,11 @@
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> ruler;
</span><del>- if find_header sasl/sasl.h && ! find_header sasl.h; then
- mkdir -p "${dev_root}/include";
- echo "#include <sasl/sasl.h>" > "${dev_root}/include/sasl.h"
</del><ins>+ if find_header sasl.h; then
</ins><span class="cx"> using_system "SASL";
</span><del>- elif find_header sasl.h; then
</del><ins>+ elif find_header sasl/sasl.h; then
+ mkdir -p "${c_glue_include}";
+ echo "#include <sasl/sasl.h>" > "${c_glue_include}/sasl.h"
</ins><span class="cx"> using_system "SASL";
</span><span class="cx"> else
</span><span class="cx"> local v="2.1.26";
</span><span class="lines">@@ -500,7 +505,6 @@
</span><span class="cx"> "ftp://ftp.cyrusimap.org/cyrus-sasl/${p}.tar.gz" \
</span><span class="cx"> --disable-macos-framework;
</span><span class="cx"> fi;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -508,28 +512,21 @@
</span><span class="cx"> # Build Python dependencies
</span><span class="cx"> #
</span><span class="cx"> py_dependencies () {
</span><del>- # export PYTHONPATH="${dev_libdir}:${PYTHONPATH:-}"
</del><ins>+ export PATH="${py_root}/bin:${PATH}";
</ins><span class="cx">
</span><del>- # export PATH="${dev_root}/bin:${PATH}";
- export C_INCLUDE_PATH="${dev_root}/include:${C_INCLUDE_PATH:-}";
- export LD_LIBRARY_PATH="${dev_root}/lib:${dev_root}/lib64:${LD_LIBRARY_PATH:-}";
- export CPPFLAGS="-I${dev_root}/include ${CPPFLAGS:-} ";
- export LDFLAGS="-L${dev_root}/lib -L${dev_root}/lib64 ${LDFLAGS:-} ";
- export DYLD_LIBRARY_PATH="${dev_root}/lib:${dev_root}/lib64:${DYLD_LIBRARY_PATH:-}";
- export PKG_CONFIG_PATH="${dev_root}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
</del><ins>+ for requirements in "${wd}/requirements/py_"*".txt"; do
</ins><span class="cx">
</span><del>- for requirements in "${wd}/requirements/"*; do
-
</del><span class="cx"> ruler "Preparing Python requirements: ${requirements}";
</span><span class="cx"> echo "";
</span><span class="cx">
</span><span class="cx"> if ! "${python}" -m pip install \
</span><span class="cx"> --requirement "${requirements}" \
</span><span class="cx"> --download-cache "${dev_home}/pip_cache" \
</span><ins>+ --log "${dev_home}/pip.log" \
</ins><span class="cx"> ; then
</span><span class="cx"> err=$?;
</span><span class="cx"> echo "Unable to set up Python requirements: ${requirements}";
</span><del>- if [ "${requirements#${wd}/requirements/opt_}" != "${requirements}" ]; then
</del><ins>+ if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
</ins><span class="cx"> echo "Requirements ${requirements} are optional; continuing.";
</span><span class="cx"> else
</span><span class="cx"> echo "";
</span></span></pre></div>
<a id="twexttrunkrequirementsbasetxt"></a>
<div class="delfile"><h4>Deleted: twext/trunk/requirements/base.txt (12459 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/base.txt        2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/base.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-cffi==0.6
-twisted>=13.2.0
</del></span></pre></div>
<a id="twexttrunkrequirementsdeveloptxt"></a>
<div class="delfile"><h4>Deleted: twext/trunk/requirements/develop.txt (12459 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/develop.txt        2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/develop.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-docutils>=0.11
-mockldap>=0.1.4
</del></span></pre></div>
<a id="twexttrunkrequirementsopt_DALtxt"></a>
<div class="delfile"><h4>Deleted: twext/trunk/requirements/opt_DAL.txt (12459 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/opt_DAL.txt        2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/opt_DAL.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-sqlparse==0.1.2
</del></span></pre></div>
<a id="twexttrunkrequirementsopt_LDAPtxt"></a>
<div class="delfile"><h4>Deleted: twext/trunk/requirements/opt_LDAP.txt (12459 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/opt_LDAP.txt        2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/opt_LDAP.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-python-ldap>=2.4.13
</del></span></pre></div>
<a id="twexttrunkrequirementsopt_Oracletxt"></a>
<div class="delfile"><h4>Deleted: twext/trunk/requirements/opt_Oracle.txt (12459 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/opt_Oracle.txt        2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/opt_Oracle.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-cx_Oracle==5.1.2
</del></span></pre></div>
<a id="twexttrunkrequirementspy_basetxtfromrev12459twexttrunkrequirementsbasetxt"></a>
<div class="copfile"><h4>Copied: twext/trunk/requirements/py_base.txt (from rev 12459, twext/trunk/requirements/base.txt) (0 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/py_base.txt         (rev 0)
+++ twext/trunk/requirements/py_base.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+cffi==0.6
+twisted>=13.2.0
</ins></span></pre></div>
<a id="twexttrunkrequirementspy_developtxtfromrev12459twexttrunkrequirementsdeveloptxt"></a>
<div class="copfile"><h4>Copied: twext/trunk/requirements/py_develop.txt (from rev 12459, twext/trunk/requirements/develop.txt) (0 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/py_develop.txt         (rev 0)
+++ twext/trunk/requirements/py_develop.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+docutils>=0.11
+mockldap>=0.1.4
</ins></span></pre></div>
<a id="twexttrunkrequirementspy_opt_DALtxtfromrev12459twexttrunkrequirementsopt_DALtxt"></a>
<div class="copfile"><h4>Copied: twext/trunk/requirements/py_opt_DAL.txt (from rev 12459, twext/trunk/requirements/opt_DAL.txt) (0 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/py_opt_DAL.txt         (rev 0)
+++ twext/trunk/requirements/py_opt_DAL.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+sqlparse==0.1.2
</ins></span></pre></div>
<a id="twexttrunkrequirementspy_opt_LDAPtxtfromrev12459twexttrunkrequirementsopt_LDAPtxt"></a>
<div class="copfile"><h4>Copied: twext/trunk/requirements/py_opt_LDAP.txt (from rev 12459, twext/trunk/requirements/opt_LDAP.txt) (0 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/py_opt_LDAP.txt         (rev 0)
+++ twext/trunk/requirements/py_opt_LDAP.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+python-ldap>=2.4.13
</ins></span></pre></div>
<a id="twexttrunkrequirementspy_opt_Oracletxtfromrev12459twexttrunkrequirementsopt_Oracletxt"></a>
<div class="copfile"><h4>Copied: twext/trunk/requirements/py_opt_Oracle.txt (from rev 12459, twext/trunk/requirements/opt_Oracle.txt) (0 => 12460)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/requirements/py_opt_Oracle.txt         (rev 0)
+++ twext/trunk/requirements/py_opt_Oracle.txt        2014-01-28 18:32:52 UTC (rev 12460)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+cx_Oracle==5.1.2
</ins></span></pre>
</div>
</div>
</body>
</html>