<!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>[12603] CalendarServer/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/12603">12603</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 10:37:44 -0800 (Fri, 07 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>_DEVELOP -&gt; _DEVELOP_PROJECT_</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunkbindevelop">CalendarServer/trunk/bin/develop</a></li>
<li><a href="#CalendarServertrunkbinpyflakes">CalendarServer/trunk/bin/pyflakes</a></li>
<li><a href="#CalendarServertrunkbinpython">CalendarServer/trunk/bin/python</a></li>
<li><a href="#CalendarServertrunkbinsim">CalendarServer/trunk/bin/sim</a></li>
<li><a href="#CalendarServertrunkbintest">CalendarServer/trunk/bin/test</a></li>
<li><a href="#CalendarServertrunkbintestserver">CalendarServer/trunk/bin/testserver</a></li>
<li><a href="#CalendarServertrunkbintrial">CalendarServer/trunk/bin/trial</a></li>
<li><a href="#CalendarServertrunkbintwistd">CalendarServer/trunk/bin/twistd</a></li>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/_build.sh        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -97,6 +97,8 @@
</span><span class="cx"> 
</span><span class="cx">   python=&quot;${py_bindir}/python&quot;;
</span><span class="cx"> 
</span><ins>+  project=&quot;$(setup_print name)&quot;;
+
</ins><span class="cx">   if [ -z &quot;${TWEXT_PKG_CACHE-}&quot; ]; then
</span><span class="cx">     dep_packages=&quot;${dev_home}/pkg&quot;;
</span><span class="cx">   else
</span><span class="lines">@@ -104,6 +106,7 @@
</span><span class="cx">   fi;
</span><span class="cx"> 
</span><span class="cx">   export PYTHONPATH=&quot;${wd}:${PYTHONPATH:-}&quot;;
</span><ins>+  export _DEVELOP_PROJECT_=&quot;${project}&quot;;
</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></pre></div>
<a id="CalendarServertrunkbindevelop"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/develop (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/develop        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/develop        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx">   wd=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd)&quot;;
</span><span class="cx"> fi;
</span><span class="cx"> 
</span><del>-export _DEVELOP=&quot;true&quot;;
-
</del><span class="cx"> . &quot;${wd}/bin/_build.sh&quot;;
</span><span class="cx"> 
</span><span class="cx"> develop;
</span></span></pre></div>
<a id="CalendarServertrunkbinpyflakes"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/pyflakes (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/pyflakes        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/pyflakes        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx"> 
</span><span class="cx"> wd=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd -L)&quot;;
</span><span class="cx"> 
</span><del>-export _DEVELOP=&quot;true&quot;;
-
</del><span class="cx"> . &quot;${wd}/bin/_build.sh&quot;;
</span><span class="cx"> 
</span><span class="cx"> init_build &gt; /dev/null;
</span></span></pre></div>
<a id="CalendarServertrunkbinpython"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/python (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/python        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/python        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -21,10 +21,6 @@
</span><span class="cx"> 
</span><span class="cx"> wd=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd)&quot;;
</span><span class="cx"> 
</span><del>-export _DEVELOP=&quot;true&quot;;
-
-export PYTHONPATH=&quot;${wd}:${PYTHONPATH:-}&quot;;
-
</del><span class="cx"> . &quot;${wd}/bin/_build.sh&quot;;
</span><span class="cx"> 
</span><span class="cx"> init_build &gt; /dev/null;
</span></span></pre></div>
<a id="CalendarServertrunkbinsim"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/sim (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/sim        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/sim        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx"> 
</span><span class="cx"> wd=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd -L)&quot;;
</span><span class="cx"> 
</span><del>-export _DEVELOP=&quot;true&quot;;
-
</del><span class="cx"> . &quot;${wd}/bin/_build.sh&quot;;
</span><span class="cx"> 
</span><span class="cx"> init_build &gt; /dev/null;
</span></span></pre></div>
<a id="CalendarServertrunkbintest"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/test (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/test        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/test        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> 
</span><span class="cx"> wd=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd -L)&quot;;
</span><span class="cx"> 
</span><del>-export _DEVELOP=&quot;true&quot;;
-
</del><span class="cx"> . &quot;${wd}/bin/_build.sh&quot;;
</span><span class="cx"> 
</span><span class="cx"> init_build &gt; /dev/null;
</span></span></pre></div>
<a id="CalendarServertrunkbintestserver"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/testserver (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/testserver        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/testserver        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx"> 
</span><span class="cx"> wd=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd -L)&quot;;
</span><span class="cx"> 
</span><del>-export _DEVELOP=&quot;true&quot;;
-
</del><span class="cx"> . &quot;${wd}/bin/_build.sh&quot;;
</span><span class="cx"> 
</span><span class="cx"> init_build &gt; /dev/null;
</span></span></pre></div>
<a id="CalendarServertrunkbintrial"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/trial (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/trial        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/trial        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx"> 
</span><span class="cx"> wd=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd)&quot;;
</span><span class="cx"> 
</span><del>-export _DEVELOP=&quot;true&quot;;
-
</del><span class="cx"> . &quot;${wd}/bin/_build.sh&quot;;
</span><span class="cx"> 
</span><span class="cx"> init_build &gt; /dev/null;
</span></span></pre></div>
<a id="CalendarServertrunkbintwistd"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/twistd (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/twistd        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/bin/twistd        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx"> 
</span><span class="cx"> wd=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd)&quot;;
</span><span class="cx"> 
</span><del>-export _DEVELOP=&quot;true&quot;;
-
</del><span class="cx"> . &quot;${wd}/bin/_build.sh&quot;;
</span><span class="cx"> 
</span><span class="cx"> init_build &gt; /dev/null;
</span></span></pre></div>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (12602 => 12603)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py        2014-02-07 18:31:48 UTC (rev 12602)
+++ CalendarServer/trunk/setup.py        2014-02-07 18:37:44 UTC (rev 12603)
</span><span class="lines">@@ -101,6 +101,8 @@
</span><span class="cx"> # Options
</span><span class="cx"> #
</span><span class="cx"> 
</span><ins>+name = &quot;CalendarServer&quot;
+
</ins><span class="cx"> description = &quot;Calendar and Contacts Server&quot;
</span><span class="cx"> 
</span><span class="cx"> long_description = file(joinpath(dirname(__file__), &quot;README.rst&quot;)).read()
</span><span class="lines">@@ -148,7 +150,7 @@
</span><span class="cx"> # Requirements for development and testing
</span><span class="cx"> develop_requirements = read_requirements(&quot;py_develop.txt&quot;)
</span><span class="cx"> 
</span><del>-if environment.get(&quot;_DEVELOP&quot;, &quot;false&quot;) == &quot;true&quot;:
</del><ins>+if environment.get(&quot;_DEVELOP_PROJECT_&quot;, None) == name:
</ins><span class="cx">     install_requirements.extend(develop_requirements)
</span><span class="cx">     install_requirements.extend(chain(*extras_requirements.values()))
</span><span class="cx"> 
</span><span class="lines">@@ -191,7 +193,7 @@
</span><span class="cx">         version_file.close()
</span><span class="cx"> 
</span><span class="cx">     dist = setup(
</span><del>-        name=&quot;CalendarServer&quot;,
</del><ins>+        name=name,
</ins><span class="cx">         version=version_string,
</span><span class="cx">         description=description,
</span><span class="cx">         long_description=long_description,
</span></span></pre>
</div>
</div>

</body>
</html>