<!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>[13260] 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/13260">13260</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-10 18:09:44 -0700 (Thu, 10 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>install target needs dep falgs for pip install</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupportApplemake">CalendarServer/trunk/support/Apple.make</a></li>
<li><a href="#CalendarServertrunksupport_cache_deps">CalendarServer/trunk/support/_cache_deps</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/Apple.make (13259 => 13260)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make        2014-04-11 00:38:45 UTC (rev 13259)
+++ CalendarServer/trunk/support/Apple.make        2014-04-11 01:09:44 UTC (rev 13260)
</span><span class="lines">@@ -36,13 +36,13 @@
</span><span class="cx"> endif
</span><span class="cx"> SERVERSETUP = $(SIPP)$(NSSYSTEMDIR)$(NSLIBRARYSUBDIR)/ServerSetup
</span><span class="cx"> 
</span><del>-Cruft += .develop
</del><ins>+# Cruft += .develop
</ins><span class="cx"> # Extra_Environment += PATH=&quot;$(SIPP)/usr/bin:$$PATH&quot;
</span><span class="cx"> # Extra_Environment += PYTHONPATH=&quot;$(CS_PY_LIBS)&quot;
</span><span class="cx"> 
</span><span class="cx"> CALDAVDSUBDIR = /caldavd
</span><span class="cx"> 
</span><del>-PYTHON = $(USRBINDIR)/python
</del><ins>+PYTHON = $(USRBINDIR)/python2.7
</ins><span class="cx"> CS_SHAREDIR = $(SHAREDIR)$(CALDAVDSUBDIR)
</span><span class="cx"> CS_PY_LIBS = $(CS_SHAREDIR)/lib/python
</span><span class="cx"> CS_LIBEXEC = $(SIPP)$(LIBEXECDIR)$(CALDAVDSUBDIR)
</span><span class="lines">@@ -70,11 +70,14 @@
</span><span class="cx">         #         install $(PY_INSTALL_FLAGS) $(CS_INSTALL_FLAGS) \
</span><span class="cx">         #         
</span><span class="cx">         @echo &quot;Installing Python packages...&quot;;
</span><del>-        $(_v) pip install -e $(BuildDirectory)/$(Project)       \
-                --install-option --root=&quot;$(DSTROOT)&quot;                \
-                --install-option --prefix=&quot;$(SIPP)&quot;                 \
-                --install-option --install-lib=&quot;$(CS_PY_LIBS)&quot;      \
-                --install-option --install-scripts=&quot;$(CS_LIBEXEC)&quot;  \
</del><ins>+        $(_v) $(PYTHON) -m pip install                                          \
+               --pre --allow-all-external --no-index                               \
+        --find-links &quot;$(Sources)/.develop/pip_downloads&quot;                    \
+            --editable &quot;$(BuildDirectory)/$(Project)[OpenDirectory,Postgres]&quot;   \
+                --install-option --root=&quot;$(DSTROOT)&quot;                                \
+                --install-option --prefix=&quot;$(SIPP)&quot;                                 \
+                --install-option --install-lib=&quot;$(CS_PY_LIBS)&quot;                      \
+                --install-option --install-scripts=&quot;$(CS_LIBEXEC)&quot;                  \
</ins><span class="cx">                 
</span><span class="cx">         @echo &quot;Cleaning up...&quot;;
</span><span class="cx">         $(_v) for so in $$(find &quot;$(DSTROOT)$(CS_SHAREDIR)/lib&quot; -type f -name '*.so'); do $(STRIP) -Sx &quot;$${so}&quot;; done;
</span></span></pre></div>
<a id="CalendarServertrunksupport_cache_deps"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/_cache_deps (13259 => 13260)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/_cache_deps        2014-04-11 00:38:45 UTC (rev 13259)
+++ CalendarServer/trunk/support/_cache_deps        2014-04-11 01:09:44 UTC (rev 13260)
</span><span class="lines">@@ -43,7 +43,8 @@
</span><span class="cx"> c_dependencies;
</span><span class="cx"> 
</span><span class="cx"> requirements=&quot;${wd}/requirements.txt&quot;;
</span><del>-extra_features=&quot;$(&quot;${python}&quot; -c 'import setup; print &quot;,&quot;.join(sorted(setup.extras_requirements.keys()))' | sed 's|Oracle,||')&quot;;
</del><ins>+#extra_features=&quot;$(&quot;${python}&quot; -c 'import setup; print &quot;,&quot;.join(sorted(setup.extras_requirements.keys()))' | sed 's|Oracle,||')&quot;;
+extra_features=&quot;OpenDirectory,Postgres&quot;;
</ins><span class="cx"> cs_repos=&quot;svn+http://svn.calendarserver.org/repository/calendarserver&quot;;
</span><span class="cx"> 
</span><span class="cx"> ruler &quot;Downloading Python requirements for .[${extra_features}]&quot;;
</span></span></pre>
</div>
</div>

</body>
</html>