<!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>[14609] 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/14609">14609</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 10:59:13 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>sync</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 (14608 => 14609)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/_build.sh 2015-03-26 17:56:00 UTC (rev 14608)
+++ twext/trunk/bin/_build.sh 2015-03-26 17:59:13 UTC (rev 14609)
</span><span class="lines">@@ -82,6 +82,8 @@
</span><span class="cx">
</span><span class="cx"> # Initialize all the global state required to use this library.
</span><span class="cx"> init_build () {
</span><ins>+ cd "${wd}";
+
</ins><span class="cx"> init_py;
</span><span class="cx">
</span><span class="cx"> # These variables are defaults for things which might be configured by
</span><span class="lines">@@ -109,10 +111,8 @@
</span><span class="cx"> dep_packages="${TWEXT_PKG_CACHE}";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- project="$(setup_print name)";
</del><ins>+ project="$(setup_print name)" || project="<unknown>";
</ins><span class="cx">
</span><del>- export _DEVELOP_PROJECT_="${project}";
-
</del><span class="cx"> # Find some hashing commands
</span><span class="cx"> # sha1() = sha1 hash, if available
</span><span class="cx"> # md5() = md5 hash, if available
</span><span class="lines">@@ -121,34 +121,35 @@
</span><span class="cx">
</span><span class="cx"> hash="";
</span><span class="cx">
</span><del>- if type -ft openssl > /dev/null; then
</del><ins>+ if find_cmd openssl > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p openssl)" dgst -md5 "$@"; }
- elif type -ft md5 > /dev/null; then
</del><ins>+ # remove "(stdin)= " from the front which openssl emits on some platforms
+ md5 () { "$(find_cmd openssl)" dgst -md5 "$@" | sed 's/^.* //'; }
+ elif find_cmd md5 > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p md5)" "$@"; }
- elif type -ft md5sum > /dev/null; then
</del><ins>+ md5 () { "$(find_cmd md5)" "$@"; }
+ elif find_cmd md5sum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="md5"; fi;
</span><del>- md5 () { "$(type -p md5sum)" "$@"; }
</del><ins>+ md5 () { "$(find_cmd md5sum)" "$@"; }
</ins><span class="cx"> fi;
</span><span class="cx">
</span><del>- if type -ft sha1sum > /dev/null; then
</del><ins>+ if find_cmd sha1sum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="sha1sum"; fi;
</span><del>- sha1 () { "$(type -p sha1sum)" "$@"; }
</del><ins>+ sha1 () { "$(find_cmd sha1sum)" "$@"; }
</ins><span class="cx"> fi;
</span><del>- if type -ft shasum > /dev/null; then
</del><ins>+ if find_cmd shasum > /dev/null; then
</ins><span class="cx"> if [ -z "${hash}" ]; then hash="sha1"; fi;
</span><del>- sha1 () { "$(type -p shasum)" "$@"; }
</del><ins>+ sha1 () { "$(find_cmd shasum)" "$@"; }
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> if [ "${hash}" = "sha1" ]; then
</span><span class="cx"> hash () { sha1 "$@"; }
</span><span class="cx"> elif [ "${hash}" = "md5" ]; then
</span><span class="cx"> hash () { md5 "$@"; }
</span><del>- elif type -t cksum > /dev/null; then
</del><ins>+ elif find_cmd cksum > /dev/null; then
</ins><span class="cx"> hash="hash";
</span><span class="cx"> hash () { cksum "$@" | cut -f 1 -d " "; }
</span><del>- elif type -t sum > /dev/null; then
</del><ins>+ elif find_cmd sum > /dev/null; then
</ins><span class="cx"> hash="hash";
</span><span class="cx"> hash () { sum "$@" | cut -f 1 -d " "; }
</span><span class="cx"> else
</span><span class="lines">@@ -158,9 +159,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> setup_print () {
</span><del>- what="$1"; shift;
</del><ins>+ local what="$1"; shift;
</ins><span class="cx">
</span><del>- PYTHONPATH="${wd}:${PYTHONPATH:-}" "${bootstrap_python}" - << EOF
</del><ins>+ PYTHONPATH="${wd}:${PYTHONPATH:-}" "${bootstrap_python}" - 2>/dev/null << EOF
</ins><span class="cx"> from __future__ import print_function
</span><span class="cx"> import setup
</span><span class="cx"> print(setup.${what})
</span><span class="lines">@@ -175,7 +176,7 @@
</span><span class="cx"> local md5="";
</span><span class="cx"> local sha1="";
</span><span class="cx">
</span><del>- OPTIND=1;
</del><ins>+ local OPTIND=1;
</ins><span class="cx"> while getopts "m:s:" option; do
</span><span class="cx"> case "${option}" in
</span><span class="cx"> 'm') md5="${OPTARG}"; ;;
</span><span class="lines">@@ -193,9 +194,11 @@
</span><span class="cx"> fi;
</span><span class="cx"> if [ ! -d "${path}" ]; then
</span><span class="cx"> local ext="$(echo "${url}" | sed 's|^.*\.\([^.]*\)$|\1|')";
</span><ins>+ local decompress="";
+ local unpack="";
</ins><span class="cx">
</span><span class="cx"> untar () { tar -xvf -; }
</span><del>- unzipstream () { tmp="$(mktemp -t ccsXXXXX)"; cat > "${tmp}"; unzip "${tmp}"; rm "${tmp}"; }
</del><ins>+ unzipstream () { local tmp="$(mktemp -t ccsXXXXX)"; cat > "${tmp}"; unzip "${tmp}"; rm "${tmp}"; }
</ins><span class="cx"> case "${ext}" in
</span><span class="cx"> gz|tgz) decompress="gzip -d -c"; unpack="untar"; ;;
</span><span class="cx"> bz2) decompress="bzip2 -d -c"; unpack="untar"; ;;
</span><span class="lines">@@ -320,6 +323,8 @@
</span><span class="cx"> # Run 'make' with the given command line, prepending a -j option appropriate to
</span><span class="cx"> # the number of CPUs on the current machine, if that can be determined.
</span><span class="cx"> jmake () {
</span><ins>+ local ncpu="";
+
</ins><span class="cx"> case "$(uname -s)" in
</span><span class="cx"> Darwin|Linux)
</span><span class="cx"> ncpu="$(getconf _NPROCESSORS_ONLN)";
</span><span class="lines">@@ -345,13 +350,18 @@
</span><span class="cx"> c_dependency () {
</span><span class="cx"> local f_hash="";
</span><span class="cx"> local configure="configure";
</span><ins>+ local prebuild_cmd="";
+ local build_cmd="jmake";
+ local install_cmd="make install";
</ins><span class="cx">
</span><del>- OPTIND=1;
- while getopts "m:s:c:" option; do
</del><ins>+ local OPTIND=1;
+ while getopts "m:s:c:p:b:" option; do
</ins><span class="cx"> case "${option}" in
</span><span class="cx"> 'm') f_hash="-m ${OPTARG}"; ;;
</span><span class="cx"> 's') f_hash="-s ${OPTARG}"; ;;
</span><span class="cx"> 'c') configure="${OPTARG}"; ;;
</span><ins>+ 'p') prebuild_cmd="${OPTARG}"; ;;
+ 'b') build_cmd="${OPTARG}"; ;;
</ins><span class="cx"> esac;
</span><span class="cx"> done;
</span><span class="cx"> shift $((${OPTIND} - 1));
</span><span class="lines">@@ -364,8 +374,7 @@
</span><span class="cx">
</span><span class="cx"> mkdir -p "${dep_sources}";
</span><span class="cx">
</span><del>- srcdir="${dep_sources}/${path}";
- # local dstroot="${srcdir}/_root";
</del><ins>+ local srcdir="${dep_sources}/${path}";
</ins><span class="cx"> local dstroot="${dev_roots}/${name}";
</span><span class="cx">
</span><span class="cx"> www_get ${f_hash} "${name}" "${srcdir}" "${uri}";
</span><span class="lines">@@ -376,7 +385,7 @@
</span><span class="cx"> export CPPFLAGS="-I${dstroot}/include ${CPPFLAGS:-} ";
</span><span class="cx"> export LDFLAGS="-L${dstroot}/lib -L${dstroot}/lib64 ${LDFLAGS:-} ";
</span><span class="cx"> export DYLD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:${DYLD_LIBRARY_PATH:-}";
</span><del>- export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
</del><ins>+ export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
</ins><span class="cx">
</span><span class="cx"> if "${do_setup}"; then
</span><span class="cx"> if "${force_setup}"; then
</span><span class="lines">@@ -386,8 +395,11 @@
</span><span class="cx"> echo "Building ${name}...";
</span><span class="cx"> cd "${srcdir}";
</span><span class="cx"> "./${configure}" --prefix="${dstroot}" "$@";
</span><del>- jmake;
- jmake install;
</del><ins>+ if [ ! -z "${prebuild_cmd}" ]; then
+ eval ${prebuild_cmd};
+ fi;
+ eval ${build_cmd};
+ eval ${install_cmd};
</ins><span class="cx"> cd "${wd}";
</span><span class="cx"> else
</span><span class="cx"> echo "Using built ${name}.";
</span><span class="lines">@@ -432,13 +444,13 @@
</span><span class="cx"> # value of OPENSSL_VERSION_NUBMER for use in inequality comparison.
</span><span class="cx"> ruler;
</span><span class="cx">
</span><del>- local min_ssl_version="9470367000"; # OpenSSL 0.9.8y
</del><ins>+ local min_ssl_version="9470367"; # OpenSSL 0.9.8y
</ins><span class="cx">
</span><span class="cx"> local ssl_version="$(c_macro openssl/ssl.h OPENSSL_VERSION_NUMBER)";
</span><span class="cx"> if [ -z "${ssl_version}" ]; then ssl_version="0x0"; fi;
</span><span class="cx"> ssl_version="$("${bootstrap_python}" -c "print ${ssl_version}")";
</span><span class="cx">
</span><del>- if [ "${ssl_version}" -lt "${min_ssl_version}" ]; then
</del><ins>+ if [ "${ssl_version}" -ge "${min_ssl_version}" ]; then
</ins><span class="cx"> using_system "OpenSSL";
</span><span class="cx"> else
</span><span class="cx"> local v="0.9.8y";
</span><span class="lines">@@ -448,8 +460,9 @@
</span><span class="cx"> # use 'config' instead of 'configure'; 'make' instead of 'jmake'.
</span><span class="cx"> # also pass 'shared' to config to build shared libs.
</span><span class="cx"> c_dependency -c "config" -m "47c7fb37f78c970f1d30aa2f9e9e26d8" \
</span><ins>+ -p "make depend" -b "make" \
</ins><span class="cx"> "openssl" "${p}" \
</span><del>- "http://www.openssl.org/source/${p}.tar.gz" "no-ssl2";
</del><ins>+ "http://www.openssl.org/source/${p}.tar.gz" "shared";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -484,7 +497,7 @@
</span><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><del>- --disable-bdb --disable-hdb;
</del><ins>+ --disable-bdb --disable-hdb --with-tls=openssl;
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -503,32 +516,12 @@
</span><span class="cx"> local p="${n}-${v}";
</span><span class="cx">
</span><span class="cx"> c_dependency -m "a7f4e5e559a0e37b3ffc438c9456e425" \
</span><del>- "Cyrus SASL" "${p}" \
</del><ins>+ "CyrusSASL" "${p}" \
</ins><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><span class="cx">
</span><span class="cx">
</span><del>- ruler;
- if type -P postgres > /dev/null; then
- using_system "Postgres";
- else
- local v="9.3.1";
- local n="postgresql";
- local p="${n}-${v}";
-
- if type -P dtrace > /dev/null; then
- local enable_dtrace="--enable-dtrace";
- else
- local enable_dtrace="";
- fi;
-
- c_dependency -m "c003d871f712d4d3895956b028a96e74" \
- "PostgreSQL" "${p}" \
- "http://ftp.postgresql.org/pub/source/v${v}/${p}.tar.bz2" \
- --with-python ${enable_dtrace};
- fi;
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -537,11 +530,13 @@
</span><span class="cx"> #
</span><span class="cx"> py_dependencies () {
</span><span class="cx"> python="${py_bindir}/python";
</span><ins>+ py_ve_tools="${dev_home}/ve_tools";
</ins><span class="cx">
</span><span class="cx"> export PATH="${py_virtualenv}/bin:${PATH}";
</span><span class="cx"> export PYTHON="${python}";
</span><del>- export PYTHONPATH="${wd}:${PYTHONPATH:-}";
</del><ins>+ export PYTHONPATH="${py_ve_tools}/lib:${wd}:${PYTHONPATH:-}";
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # Work around a change in Xcode tools that breaks Python modules in OS X
</span><span class="cx"> # 10.9.2 and prior due to a hard error if the -mno-fused-madd is used, as
</span><span class="cx"> # it was in the system Python, and is therefore passed along by disutils.
</span><span class="lines">@@ -563,14 +558,17 @@
</span><span class="cx">
</span><span class="cx"> if [ ! -d "${py_virtualenv}" ]; then
</span><span class="cx"> bootstrap_virtualenv;
</span><del>- "${bootstrap_python}" -m virtualenv --system-site-packages "${py_virtualenv}";
</del><ins>+ "${bootstrap_python}" -m virtualenv \
+ --system-site-packages \
+ --no-setuptools \
+ "${py_virtualenv}";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> cd "${wd}";
</span><span class="cx">
</span><span class="cx"> # Make sure setup got called enough to write the version file.
</span><span class="cx">
</span><del>- "${python}" "${wd}/setup.py" check > /dev/null;
</del><ins>+ PYTHONPATH="${PYTHONPATH}" "${python}" "${wd}/setup.py" check > /dev/null;
</ins><span class="cx">
</span><span class="cx"> if [ -d "${dev_home}/pip_downloads" ]; then
</span><span class="cx"> pip_install="pip_install_from_cache";
</span><span class="lines">@@ -595,33 +593,23 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> bootstrap_virtualenv () {
</span><del>- py_ve_tools="${dev_home}/ve_tools";
-
- if [ -d "${py_ve_tools}/lib" ]; then
- export PYTHONPATH="${py_ve_tools}/lib:${PYTHONPATH:-}";
- fi;
-
- if "${bootstrap_python}" -m virtualenv > /dev/null 2>&1; then
- return 0;
- fi;
-
</del><span class="cx"> mkdir -p "${py_ve_tools}";
</span><span class="cx"> mkdir -p "${py_ve_tools}/lib";
</span><span class="cx"> mkdir -p "${py_ve_tools}/junk";
</span><span class="cx">
</span><span class="cx"> for pkg in \
</span><del>- pip-1.5.4 \
- virtualenv-1.11.4 \
- setuptools-3.4.4 \
</del><ins>+ setuptools-12.0.5 \
+ pip-6.0.8 \
+ virtualenv-12.0.7 \
</ins><span class="cx"> ; do
</span><del>- name="${pkg%-*}";
- version="${pkg#*-}";
- first="$(echo "${name}" | sed 's|^\(.\).*$|\1|')";
- url="https://pypi.python.org/packages/source/${first}/${name}/${pkg}.tar.gz";
</del><ins>+ local name="${pkg%-*}";
+ local version="${pkg#*-}";
+ local first="$(echo "${name}" | sed 's|^\(.\).*$|\1|')";
+ local url="https://pypi.python.org/packages/source/${first}/${name}/${pkg}.tar.gz";
</ins><span class="cx">
</span><span class="cx"> ruler "Downloading ${pkg}";
</span><span class="cx">
</span><del>- tmp="$(mktemp -d -t ccsXXXXX)";
</del><ins>+ local tmp="$(mktemp -d -t ccsXXXXX)";
</ins><span class="cx">
</span><span class="cx"> curl -L "${url}" | tar -C "${tmp}" -xvzf -;
</span><span class="cx">
</span><span class="lines">@@ -638,8 +626,6 @@
</span><span class="cx">
</span><span class="cx"> rm -rf "${tmp}";
</span><span class="cx"> done;
</span><del>-
- export PYTHONPATH="${py_ve_tools}/lib:${PYTHONPATH:-}";
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -667,7 +653,6 @@
</span><span class="cx"> pip_download_and_install () {
</span><span class="cx"> "${python}" -m pip install \
</span><span class="cx"> --pre --allow-all-external \
</span><del>- --download-cache="${dev_home}/pip_cache" \
</del><span class="cx"> --log-file="${dev_home}/pip.log" \
</span><span class="cx"> "$@";
</span><span class="cx"> }
</span><span class="lines">@@ -681,3 +666,20 @@
</span><span class="cx"> c_dependencies;
</span><span class="cx"> py_dependencies;
</span><span class="cx"> }
</span><ins>+
+
+develop_clean () {
+ init_build;
+
+ # Clean
+ rm -rf "${dev_roots}";
+ rm -rf "${py_virtualenv}";
+}
+
+
+develop_distclean () {
+ init_build;
+
+ # Clean
+ rm -rf "${dev_home}";
+}
</ins></span></pre></div>
<a id="twexttrunkbin_pysh"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/_py.sh (14608 => 14609)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/_py.sh 2015-03-26 17:56:00 UTC (rev 14608)
+++ twext/trunk/bin/_py.sh 2015-03-26 17:59:13 UTC (rev 14609)
</span><span class="lines">@@ -15,6 +15,18 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+find_cmd () {
+ local cmd="$1"; shift;
+
+ local path="$(type "${cmd}" 2>/dev/null | sed "s|^${cmd} is \(a tracked alias for \)\{0,1\}||")";
+
+ if [ -z "${cmd}" ]; then
+ return 1;
+ fi;
+
+ echo "${path}";
+}
+
</ins><span class="cx"> # Echo the major.minor version of the given Python interpreter.
</span><span class="cx">
</span><span class="cx"> py_version () {
</span><span class="lines">@@ -38,7 +50,7 @@
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> local py_version="$(py_version "${python}")";
</span><del>- if [ "${py_version/./}" -lt "25" ]; then
</del><ins>+ if [ "$(echo "${py_version}" | sed 's|\.||')" -lt "25" ]; then
</ins><span class="cx"> return 1;
</span><span class="cx"> fi;
</span><span class="cx"> return 0;
</span><span class="lines">@@ -49,30 +61,20 @@
</span><span class="cx"> # Detect which version of Python to use, then print out which one was detected.
</span><span class="cx"> #
</span><span class="cx"> # This will prefer the python interpreter in the PYTHON environment variable.
</span><del>-# If that's not found, it will check for "python2.7", "python2.6" and "python",
-# looking for each in your PATH and, failing that, in a number of well-known
-# locations.
</del><ins>+# If that's not found, it will check for "python2.7" and "python", looking for
+# each in your PATH.
</ins><span class="cx"> #
</span><span class="cx"> detect_python_version () {
</span><span class="cx"> local v;
</span><span class="cx"> local p;
</span><del>- for v in "2.7" "2.6" ""
</del><ins>+ for v in "2.7" ""
</ins><span class="cx"> do
</span><del>- for p in \
- "${PYTHON:=}" \
- "python${v}" \
- "/usr/local/bin/python${v}" \
- "/usr/local/python/bin/python${v}" \
- "/usr/local/python${v}/bin/python${v}" \
- "/opt/bin/python${v}" \
- "/opt/python/bin/python${v}" \
- "/opt/python${v}/bin/python${v}" \
- "/Library/Frameworks/Python.framework/Versions/${v}/bin/python" \
- "/opt/local/bin/python${v}" \
- "/sw/bin/python${v}" \
</del><ins>+ for p in \
+ "${PYTHON:=}" \
+ "python${v}" \
</ins><span class="cx"> ;
</span><span class="cx"> do
</span><del>- if p="$(type -p "${p}")"; then
</del><ins>+ if p="$(find_cmd "${p}")"; then
</ins><span class="cx"> if try_python "${p}"; then
</span><span class="cx"> echo "${p}";
</span><span class="cx"> return 0;
</span><span class="lines">@@ -148,7 +150,7 @@
</span><span class="cx"> # the part of the PostgreSQL build process which builds pl_python. Note that
</span><span class="cx"> # detect_python_version, above, already honors $PYTHON, so if this is already
</span><span class="cx"> # set it won't be stomped on, it will just be re-set to the same value.
</span><del>- export PYTHON="$(type -p ${bootstrap_python})";
</del><ins>+ export PYTHON="$(find_cmd ${bootstrap_python})";
</ins><span class="cx">
</span><span class="cx"> if [ -z "${bootstrap_python:-}" ]; then
</span><span class="cx"> echo "No suitable python found. Python 2.6 or 2.7 is required.";
</span></span></pre>
</div>
</div>
</body>
</html>