<!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>[14979] 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/14979">14979</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-20 12:08:02 -0700 (Mon, 20 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix issue with virtualenv being locked to specific system Python versions.</pre>

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

<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunksupportundovirtualenv">CalendarServer/trunk/support/undo-virtualenv</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/Apple.make (14978 => 14979)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make        2015-07-17 01:25:23 UTC (rev 14978)
+++ CalendarServer/trunk/support/Apple.make        2015-07-20 19:08:02 UTC (rev 14979)
</span><span class="lines">@@ -85,18 +85,15 @@
</span><span class="cx">         @#
</span><span class="cx">         @# Set up a virtual environment in Server.app; we'll install into that.
</span><span class="cx">         @# That creates a self-contained environment which has specific version of
</span><del>-        @# (almost) all of our dependancies in it.
</del><ins>+        @# (almost) all of our dependencies in it.
</ins><span class="cx">         @# Use --system-site-packages so that we use the packages provided by the
</span><span class="cx">         @# OS, such as PyObjC.
</span><del>-        @# Use --always-copy because we want copies of, not links to, the system
-        @# python, as Server.app is an independent product train.
</del><span class="cx">         @#
</span><span class="cx">         @echo &quot;Creating virtual environment...&quot;;
</span><span class="cx">         $(_v) $(RMDIR) &quot;$(DSTROOT)$(CS_VIRTUALENV)&quot;;
</span><span class="cx">         $(_v) PYTHONPATH=&quot;$(BuildDirectory)/pytools/lib&quot; \
</span><span class="cx">                   &quot;$(PYTHON)&quot; -m virtualenv              \
</span><span class="cx">                           --system-site-packages             \
</span><del>-                          --always-copy                      \
</del><span class="cx">                           &quot;$(DSTROOT)$(CS_VIRTUALENV)&quot;;
</span><span class="cx">         @#
</span><span class="cx">         @# Use the pip in the virtual environment (as opposed to pip in the OS) to
</span><span class="lines">@@ -131,7 +128,7 @@
</span><span class="cx">                       --ignore-installed                                      \
</span><span class="cx">                       Twisted;
</span><span class="cx"> 
</span><del>-        @echo &quot;Installing CalendarServer and remaining dependancies...&quot;;
</del><ins>+        @echo &quot;Installing CalendarServer and remaining dependencies...&quot;;
</ins><span class="cx">         $(_v) $(Environment)                                                  \
</span><span class="cx">                   &quot;$(DSTROOT)$(CS_VIRTUALENV)/bin/pip&quot; install                \
</span><span class="cx">                       --disable-pip-version-check                             \
</span><span class="lines">@@ -153,14 +150,16 @@
</span><span class="cx">         $(_v) perl -i -pe &quot;s|#PATH|export PYTHON=$(CS_VIRTUALENV)/bin/python;|&quot; &quot;$(DSTROOT)$(CS_VIRTUALENV)/bin/caldavd&quot;;
</span><span class="cx">         @echo &quot;Stripping binaries...&quot;;
</span><span class="cx">         $(_v) find &quot;$(DSTROOT)$(CS_VIRTUALENV)&quot; -type f -name &quot;*.so&quot; -print0 | xargs -0 $(STRIP) -Sx;
</span><del>-        @echo &quot;Updating install location of Python library...&quot;;
-        $(_v) find &quot;$(DSTROOT)$(CS_VIRTUALENV)/bin&quot; -type f -name &quot;python*&quot; -print0 | \
-                  xargs -0 -n 1 install_name_tool -change &quot;@executable_path/../.Python&quot; &quot;$(CS_VIRTUALENV)/.Python&quot;;
-        $(_v) install_name_tool -id &quot;$(CS_VIRTUALENV)/.Python&quot; &quot;$(DSTROOT)$(CS_VIRTUALENV)/.Python&quot;;
</del><span class="cx">         @echo &quot;Putting comments into empty files...&quot;;
</span><span class="cx">         $(_v) find &quot;$(DSTROOT)$(CS_VIRTUALENV)&quot; -type f -size 0 -name &quot;*.py&quot; -exec sh -c 'printf &quot;# empty\n&quot; &gt; {}' &quot;;&quot;;
</span><span class="cx">         $(_v) find &quot;$(DSTROOT)$(CS_VIRTUALENV)&quot; -type f -size 0 -name &quot;*.h&quot; -exec sh -c 'printf &quot;/* empty */\n&quot; &gt; {}' &quot;;&quot;;
</span><span class="cx"> 
</span><ins>+        @#
+        @# Undo virtualenv so we use the system Python
+        @#
+        @echo &quot;Undo virtualenv...&quot;;
+        $(_v) &quot;$(Sources)/support/undo-virtualenv&quot; &quot;$(DSTROOT)$(CS_VIRTUALENV)&quot;
+
</ins><span class="cx"> install:: install-config
</span><span class="cx"> install-config::
</span><span class="cx">         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)&quot;;
</span></span></pre></div>
<a id="CalendarServertrunksupportundovirtualenv"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/support/undo-virtualenv (0 => 14979)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/undo-virtualenv                                (rev 0)
+++ CalendarServer/trunk/support/undo-virtualenv        2015-07-20 19:08:02 UTC (rev 14979)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+#!/bin/sh
+
+set -e
+set -u
+
+base=&quot;${1}&quot;;
+
+# Remove python binaries
+rm -f &quot;${base}/bin/python&quot;;
+rm -f &quot;${base}/bin/python2&quot;;
+rm -f &quot;${base}/bin/python2.7&quot;;
+
+# Remove unused virtualenv files
+rm -f &quot;${base}/lib/python2.7/&quot;*.py*;
+rm -f &quot;${base}/lib/python2.7/config&quot;;
+rm -rf &quot;${base}/lib/python2.7/distutils&quot;;
+rm -f &quot;${base}/lib/python2.7/encodings&quot;;
+rm -f &quot;${base}/lib/python2.7/lib-dynload&quot;;
+rm -f &quot;${base}/lib/python2.7/orig-prefix.txt&quot;;
+
+# New python shim that sets up paths and runs the system python
+cat - &gt; &quot;${base}/bin/python&quot; &lt;&lt;EOF
+#!/bin/sh
+
+export PATH=/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin:\${PATH};
+export PYTHONPATH=/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/lib/python2.7/site-packages;
+
+exec /usr/bin/python &quot;\${@}&quot;;
+EOF
+
+chmod a+x &quot;${base}/bin/python&quot;;
+ln -s &quot;${base}/bin/python&quot; &quot;${base}/bin/python2&quot;;
+ln -s &quot;${base}/bin/python&quot; &quot;${base}/bin/python2.7&quot;;
</ins><span class="cx">Property changes on: CalendarServer/trunk/support/undo-virtualenv
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
</div>

</body>
</html>