<!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>[12027] CalendarServer/trunk/support</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/12027">12027</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-03 15:34:35 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify find_header</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupportbuildsh">CalendarServer/trunk/support/build.sh</a></li>
<li><a href="#CalendarServertrunksupportpysh">CalendarServer/trunk/support/py.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksupportbuildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/build.sh (12026 => 12027)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/build.sh 2013-12-03 22:33:08 UTC (rev 12026)
+++ CalendarServer/trunk/support/build.sh 2013-12-03 23:34:35 UTC (rev 12027)
</span><span class="lines">@@ -16,6 +16,9 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+set -e
+set -u
+
</ins><span class="cx"> . "${wd}/support/py.sh";
</span><span class="cx">
</span><span class="cx"> echo_header () {
</span><span class="lines">@@ -51,55 +54,33 @@
</span><span class="cx"> # Assert that ldap.h is present with a version >= 20344
</span><span class="cx"> # find_header "ldap.h" 20344 "LDAP_VENDOR_VERSION"
</span><span class="cx"> find_header () {
</span><del>- ARGS="$@";
- ret=1; # default to a failed check, forcing a fetch of the depencency
- i=0;
- for a in $ARGS; do
- [ $i -eq 0 ] && local sysheader="$1";
- [ $i -eq 1 ] && local minver="$2";
- [ $i -eq 2 ] && local def="$3";
- i=$(($i+1));
- done;
- [ ! $sysheader ] && return 1;
</del><ins>+ sys_header="$1"; shift;
+ if [ $# -ge 1 ]; then
+ min_version="$1"; shift;
+ version_macro="$1"; shift;
+ fi;
+
+ # No min_version given:
</ins><span class="cx"> # Check for presence of a header. We use the "-c" cc option because we don't
</span><span class="cx"> # need to emit a file; cc exits nonzero if it can't find the header
</span><del>- if [ $# -lt 2 ]; then
- echo "#include <${sysheader}>" | cc -x c -c - -o /dev/null 2> /dev/null;
</del><ins>+ if [ -z "${min_version:-}" ]; then
+ echo "#include <${sys_header}>" | cc -x c -c - -o /dev/null 2> /dev/null;
</ins><span class="cx"> return "$?";
</span><ins>+ fi;
+
</ins><span class="cx"> # Check for presence of a header of specified version
</span><ins>+ found_version="$(printf "#include <${sys_header}>\n${version_macro}\n" | cc -x c -E - | tail -1)";
+
+ if [ "${found_version}" == "${version_macro}" ]; then
+ # Macro was not replaced
+ return 1;
+ fi;
+
+ if cmp_version "${min_version}" "${found_version}"; then
+ return 0;
</ins><span class="cx"> else
</span><del>- found='';
- local aout=$(mktemp -t ccXXXXXX); # compiled executable file path
- local prog=$(mktemp -t ccXXXXXX); # C source file path
- cat <<DOC > ${prog}
-#include <${sysheader}>
-#include <stdio.h>
-#define STR(x) #x
-#define SHOW_DEFINE(x) printf("%s", STR(x))
-int main()
-{
- if (${def})
- {
- SHOW_DEFINE(${def});
- return 0;
- };
</del><span class="cx"> return 1;
</span><del>-};
-DOC
- cc -x c -o ${aout} ${prog} &> /dev/null;
- if [ $? -eq 0 ] && [ -e ${aout} ] ; then
- found=$(${aout});
- fi;
- if [ $? -eq 0 ] && [ ! -z ${found} ] ; then
- cmp_version $minver $found;
- ret=$?;
- else
- ret=1; #cc exited nonzero or didn't emit a file
- fi;
- rm -f "${aout}";
- rm -f "${prog}";
</del><span class="cx"> fi;
</span><del>- return $ret;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> # Initialize all the global state required to use this library.
</span></span></pre></div>
<a id="CalendarServertrunksupportpysh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/py.sh (12026 => 12027)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/py.sh 2013-12-03 22:33:08 UTC (rev 12026)
+++ CalendarServer/trunk/support/py.sh 2013-12-03 23:34:35 UTC (rev 12027)
</span><span class="lines">@@ -15,6 +15,9 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+set -e
+set -u
+
</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></pre>
</div>
</div>
</body>
</html>