<!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>[12438] 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/12438">12438</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-23 17:43:49 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More work on build tools</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunkbin_buildsh">twext/trunk/bin/_build.sh</a></li>
<li><a href="#twexttrunkbinpyflakes">twext/trunk/bin/pyflakes</a></li>
<li><a href="#twexttrunkbinpython">twext/trunk/bin/python</a></li>
<li><a href="#twexttrunkbintest">twext/trunk/bin/test</a></li>
<li><a href="#twexttrunkbintrial">twext/trunk/bin/trial</a></li>
<li><a href="#twexttrunkbintwistd">twext/trunk/bin/twistd</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 (12437 => 12438)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/_build.sh 2014-01-23 23:53:58 UTC (rev 12437)
+++ twext/trunk/bin/_build.sh 2014-01-24 01:43:49 UTC (rev 12438)
</span><span class="lines">@@ -100,8 +100,15 @@
</span><span class="cx">
</span><span class="cx"> mkdir -p "${dep_sources}";
</span><span class="cx">
</span><ins>+ # Set up virtual environment
+
+ "${bootstrap_python}" -m virtualenv "${dev_root}";
+
+ python="${dev_bindir}/python";
+
</ins><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><ins>+
</ins><span class="cx"> conditional_set wd "$(pwd)";
</span><span class="cx">
</span><span class="cx"> # Find some hashing commands
</span><span class="lines">@@ -497,9 +504,6 @@
</span><span class="cx"> # Build Python dependencies
</span><span class="cx"> #
</span><span class="cx"> py_dependencies () {
</span><del>- mkdir -p "${dev_root}";
- mkdir -p "${dev_libdir}";
-
</del><span class="cx"> # export PYTHONPATH="${dev_libdir}:${PYTHONPATH:-}"
</span><span class="cx">
</span><span class="cx"> # export PATH="${dev_root}/bin:${PATH}";
</span><span class="lines">@@ -510,13 +514,8 @@
</span><span class="cx"> # export DYLD_LIBRARY_PATH="${dev_root}/lib:${dev_root}/lib64:${DYLD_LIBRARY_PATH:-}";
</span><span class="cx"> # export PKG_CONFIG_PATH="${dev_root}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
</span><span class="cx">
</span><del>- cd "${wd}";
</del><ins>+ # cd "${wd}";
</ins><span class="cx">
</span><del>-
- "${bootstrap_python}" -m virtualenv "${dev_root}";
-
- python="${dev_bindir}/python";
-
</del><span class="cx"> for requirements in "${wd}/requirements/"*; do
</span><span class="cx">
</span><span class="cx"> ruler "Preparing Python requirements: ${requirements}";
</span></span></pre></div>
<a id="twexttrunkbinpyflakes"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/pyflakes (12437 => 12438)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/pyflakes 2014-01-23 23:53:58 UTC (rev 12437)
+++ twext/trunk/bin/pyflakes 2014-01-24 01:43:49 UTC (rev 12438)
</span><span class="lines">@@ -25,7 +25,13 @@
</span><span class="cx">
</span><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><del>-develop;
</del><ins>+init_build > /dev/null;
</ins><span class="cx">
</span><del>-pip install pyflakes --no-use-wheel --upgrade --target="${dev_libdir}" > "${dev_root}/pip_pyflakes.log" || true;
</del><ins>+if [ $# -eq 0 ]; then
+ set - calendarserver contrib twisted twistedcaldav txdav txweb2;
+fi;
+
+"${python}" -m pip install pyflakes --upgrade >> "${dev_home}/setup.log";
+
+echo "Checking modules:" "$@";
</ins><span class="cx"> exec "${python}" -m pyflakes "$@";
</span></span></pre></div>
<a id="twexttrunkbinpython"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/python (12437 => 12438)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/python 2014-01-23 23:53:58 UTC (rev 12437)
+++ twext/trunk/bin/python 2014-01-24 01:43:49 UTC (rev 12438)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx">
</span><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><del>-develop;
</del><ins>+init_build > /dev/null;
+c_dependencies >> "${dev_root}/setup.log";
+py_dependencies >> "${dev_root}/setup.log";
</ins><span class="cx">
</span><span class="cx"> exec "${python}" "$@";
</span></span></pre></div>
<a id="twexttrunkbintest"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/test (12437 => 12438)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/test 2014-01-23 23:53:58 UTC (rev 12437)
+++ twext/trunk/bin/test 2014-01-24 01:43:49 UTC (rev 12438)
</span><span class="lines">@@ -25,7 +25,9 @@
</span><span class="cx">
</span><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><del>-develop;
</del><ins>+init_build > /dev/null;
+c_dependencies >> "${dev_home}/setup.log";
+py_dependencies >> "${dev_home}/setup.log";
</ins><span class="cx">
</span><span class="cx"> ##
</span><span class="cx"> # Options
</span></span></pre></div>
<a id="twexttrunkbintrial"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/trial (12437 => 12438)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/trial 2014-01-23 23:53:58 UTC (rev 12437)
+++ twext/trunk/bin/trial 2014-01-24 01:43:49 UTC (rev 12438)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><del>-#!/usr/bin/env python
</del><ins>+#!/bin/sh
</ins><span class="cx">
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2006-2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="cx"> # You may obtain a copy of the License at
</span><span class="cx"> #
</span><del>-# http://www.apache.org/licenses/LICENSE-2.0
</del><ins>+# http://www.apache.org/licenses/LICENSE-2.0
</ins><span class="cx"> #
</span><span class="cx"> # Unless required by applicable law or agreed to in writing, software
</span><span class="cx"> # distributed under the License is distributed on an "AS IS" BASIS,
</span><span class="lines">@@ -16,24 +16,17 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from __future__ import print_function
</del><ins>+set -e
+set -u
</ins><span class="cx">
</span><del>-import sys
-import os
</del><ins>+wd="$(cd "$(dirname "$0")/.." && pwd)";
</ins><span class="cx">
</span><del>-#PYTHONPATH
</del><ins>+export TWEXT_DEVELOP="true";
</ins><span class="cx">
</span><del>-if __name__ == "__main__":
- if "PYTHONPATH" in globals():
- sys.path.insert(0, PYTHONPATH)
- else:
- try:
- import _twext_preamble
- except ImportError:
- sys.exc_clear()
</del><ins>+. "${wd}/bin/_build.sh";
</ins><span class="cx">
</span><del>- for name, value in os.environ.items():
- print("{0}={1}".format(name, value))
</del><ins>+init_build > /dev/null;
+c_dependencies >> "${dev_home}/setup.log";
+py_dependencies >> "${dev_home}/setup.log";
</ins><span class="cx">
</span><del>- from twisted.scripts.trial import run
- run()
</del><ins>+exec "${dev_bindir}/trial" "$@";
</ins></span></pre></div>
<a id="twexttrunkbintwistd"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/twistd (12437 => 12438)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/twistd 2014-01-23 23:53:58 UTC (rev 12437)
+++ twext/trunk/bin/twistd 2014-01-24 01:43:49 UTC (rev 12438)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><del>-#!/usr/bin/env python
</del><ins>+#!/bin/sh
</ins><span class="cx">
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2006-2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="cx"> # You may obtain a copy of the License at
</span><span class="cx"> #
</span><del>-# http://www.apache.org/licenses/LICENSE-2.0
</del><ins>+# http://www.apache.org/licenses/LICENSE-2.0
</ins><span class="cx"> #
</span><span class="cx"> # Unless required by applicable law or agreed to in writing, software
</span><span class="cx"> # distributed under the License is distributed on an "AS IS" BASIS,
</span><span class="lines">@@ -16,18 +16,17 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-import sys
</del><ins>+set -e
+set -u
</ins><span class="cx">
</span><del>-#PYTHONPATH
</del><ins>+wd="$(cd "$(dirname "$0")/.." && pwd)";
</ins><span class="cx">
</span><del>-if __name__ == "__main__":
- if "PYTHONPATH" in globals():
- sys.path.insert(0, PYTHONPATH)
- else:
- try:
- import _twext_preamble
- except ImportError:
- sys.exc_clear()
</del><ins>+export TWEXT_DEVELOP="true";
</ins><span class="cx">
</span><del>- from twisted.scripts.twistd import run
- run()
</del><ins>+. "${wd}/bin/_build.sh";
+
+init_build > /dev/null;
+c_dependencies >> "${dev_home}/setup.log";
+py_dependencies >> "${dev_home}/setup.log";
+
+exec "${dev_bindir}/twistd" "$@";
</ins></span></pre>
</div>
</div>
</body>
</html>