<!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>[14310] CalendarServer/trunk/support/Apple.make</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/14310">14310</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 11:48:38 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Instead of installing each dependancy by explicitly naming each cached package, ask pip to install CalendarServer[OpenDirectory,Postgres] and let it figure out what to install (and in what order).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupportApplemake">CalendarServer/trunk/support/Apple.make</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/Apple.make (14309 => 14310)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make 2015-01-15 18:33:32 UTC (rev 14309)
+++ CalendarServer/trunk/support/Apple.make 2015-01-15 19:48:38 UTC (rev 14310)
</span><span class="lines">@@ -58,15 +58,13 @@
</span><span class="cx">
</span><span class="cx"> build:: $(BuildDirectory)/$(Project)
</span><span class="cx">
</span><del>-build-no::
- @echo "Building $(Project)...";
- $(_v) cd $(BuildDirectory)/$(Project) && $(Environment) $(PYTHON) setup.py build
-
</del><span class="cx"> install:: install-python
</span><span class="cx"> install-python:: build
</span><span class="cx"> @#
</span><del>- @# Install virtualenv someplace and put it in PYTHONPATH in case it's not
- @# on the host system.
</del><ins>+ @# We need the virtualenv + pip + setuptools toolchain.
+ @# Install virtualenv someplace and put it in PYTHONPATH so we have it.
+ @# This way, the host system we're building on doesn't need to have these
+ @# tools and we can ensure that we're using known versions.
</ins><span class="cx"> @#
</span><span class="cx"> @echo "Installing virtualenv and friends...";
</span><span class="cx"> $(_v) mkdir -p "$(BuildDirectory)/pytools";
</span><span class="lines">@@ -86,7 +84,12 @@
</span><span class="cx"> done;
</span><span class="cx"> @#
</span><span class="cx"> @# Set up a virtual environment in Server.app; we'll install into that.
</span><del>- @# Use --system-site-packages so that we use the packages provided by the OS.
</del><ins>+ @# That creates a self-contained environment which has specific version of
+ @# (almost) all of our dependancies in it.
+ @# Use --system-site-packages so that we use the packages provided by the
+ @# OS, such as PyObjC.
+ @# Use --always-copy because we want copies of, not links to, the system
+ @# python, as Server.app is an indenpendant product train.
</ins><span class="cx"> @#
</span><span class="cx"> @echo "Creating virtual environment...";
</span><span class="cx"> $(_v) $(RMDIR) "$(DSTROOT)$(CS_VIRTUALENV)";
</span><span class="lines">@@ -96,25 +99,19 @@
</span><span class="cx"> --always-copy \
</span><span class="cx"> "$(DSTROOT)$(CS_VIRTUALENV)";
</span><span class="cx"> @#
</span><del>- @# Use the pip in the virtual environment to install.
- @# It knows about where things go in the virtual environment.
</del><ins>+ @# Use the pip in the virtual environment (as opposed to pip in the OS) to
+ @# install, as it knows about where things go in the virtual environment.
+ @# Use --no-index and --find-links so that we don't use PyPI; we want to
+ @# use the cached downloads we submit to B&I, and not fetch content from
+ @# the Internet.
</ins><span class="cx"> @#
</span><span class="cx"> @echo "Installing Python packages...";
</span><del>- @# $(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \
- @# $(Environment) \
- @# "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \
- @# --pre --allow-all-external --no-index --no-deps \
- @# --log=$(OBJROOT)/pip.log \
- @# "$${pkg}" || exit 1; \
- @# done;
- $(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \
- $(Environment) \
- "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \
- --pre --allow-all-external --no-index \
- --find-links="file://$(Sources)/.develop/pip_downloads" \
- --log=$(OBJROOT)/pip.log \
- "$${pkg}" || exit 1; \
- done;
</del><ins>+ $(_v) $(Environment) \
+ "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install \
+ --pre --allow-all-external --no-index \
+ --find-links="file://$(Sources)/.develop/pip_downloads" \
+ --log=$(OBJROOT)/pip.log \
+ CalendarServer[OpenDirectory,Postgres]
</ins><span class="cx"> @#
</span><span class="cx"> @# Make the virtualenv relocatable
</span><span class="cx"> @#
</span><span class="lines">@@ -131,6 +128,7 @@
</span><span class="cx"> @echo "Putting comments into empty files...";
</span><span class="cx"> $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -name "*.py" -exec sh -c 'printf "# empty\n" > {}' ";";
</span><span class="cx"> $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -name "*.h" -exec sh -c 'printf "/* empty */\n" > {}' ";";
</span><ins>+ @# This is obsoleted by using --always-copy when we create the virtualenv:
</ins><span class="cx"> @# @echo "Replacing symbolic links...";
</span><span class="cx"> @# $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type l | \
</span><span class="cx"> @# while read link; do \
</span></span></pre>
</div>
</div>
</body>
</html>