<!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>[14987] CalendarServer/branches/release/CalendarServer-6.2-dev/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/14987">14987</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 13:12:33 -0700 (Wed, 22 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="#CalendarServerbranchesreleaseCalendarServer62devsupportApplemake">CalendarServer/branches/release/CalendarServer-6.2-dev/support/Apple.make</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer62devsupportpythonwrapperc">CalendarServer/branches/release/CalendarServer-6.2-dev/support/python-wrapper.c</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer62devsupportundovirtualenv">CalendarServer/branches/release/CalendarServer-6.2-dev/support/undo-virtualenv</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer62devsupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.2-dev/support/Apple.make (14986 => 14987)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.2-dev/support/Apple.make 2015-07-22 18:47:19 UTC (rev 14986)
+++ CalendarServer/branches/release/CalendarServer-6.2-dev/support/Apple.make 2015-07-22 20:12:33 UTC (rev 14987)
</span><span class="lines">@@ -58,6 +58,12 @@
</span><span class="cx">
</span><span class="cx"> build:: $(BuildDirectory)/$(Project)
</span><span class="cx">
</span><ins>+build:: build-wrapper
+build-wrapper: $(BuildDirectory)/python-wrapper
+
+$(BuildDirectory)/python-wrapper: $(Sources)/support/python-wrapper.c
+ $(CC) $(Sources)/support/python-wrapper.c -o $(BuildDirectory)/python-wrapper
+
</ins><span class="cx"> install:: install-python
</span><span class="cx"> install-python:: build
</span><span class="cx"> @#
</span><span class="lines">@@ -85,18 +91,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 "Creating virtual environment...";
</span><span class="cx"> $(_v) $(RMDIR) "$(DSTROOT)$(CS_VIRTUALENV)";
</span><span class="cx"> $(_v) PYTHONPATH="$(BuildDirectory)/pytools/lib" \
</span><span class="cx"> "$(PYTHON)" -m virtualenv \
</span><span class="cx"> --system-site-packages \
</span><del>- --always-copy \
</del><span class="cx"> "$(DSTROOT)$(CS_VIRTUALENV)";
</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">@@ -135,14 +138,18 @@
</span><span class="cx"> $(_v) perl -i -pe "s|#PATH|export PYTHON=$(CS_VIRTUALENV)/bin/python;|" "$(DSTROOT)$(CS_VIRTUALENV)/bin/caldavd";
</span><span class="cx"> @echo "Stripping binaries...";
</span><span class="cx"> $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -name "*.so" -print0 | xargs -0 $(STRIP) -Sx;
</span><del>- @echo "Updating install location of Python library...";
- $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)/bin" -type f -name "python*" -print0 | \
- xargs -0 -n 1 install_name_tool -change "@executable_path/../.Python" "$(CS_VIRTUALENV)/.Python";
- $(_v) install_name_tool -id "$(CS_VIRTUALENV)/.Python" "$(DSTROOT)$(CS_VIRTUALENV)/.Python";
</del><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><span class="cx">
</span><ins>+ @#
+ @# Undo virtualenv so we use the python-wrapper
+ @#
+ @echo "Undo virtualenv...";
+ $(_v) cp "$(BuildDirectory)/python-wrapper" "$(DSTROOT)$(CS_VIRTUALENV)/bin"
+ $(_v) $(STRIP) -Sx "$(DSTROOT)$(CS_VIRTUALENV)/bin/python-wrapper"
+ $(_v) "$(Sources)/support/undo-virtualenv" "$(DSTROOT)$(CS_VIRTUALENV)"
+
</ins><span class="cx"> install:: install-config
</span><span class="cx"> install-config::
</span><span class="cx"> $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)";
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer62devsupportpythonwrapperc"></a>
<div class="addfile"><h4>Added: CalendarServer/branches/release/CalendarServer-6.2-dev/support/python-wrapper.c (0 => 14987)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.2-dev/support/python-wrapper.c (rev 0)
+++ CalendarServer/branches/release/CalendarServer-6.2-dev/support/python-wrapper.c 2015-07-22 20:12:33 UTC (rev 14987)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+//
+// python-wrapper.c
+//
+// Copyright © 2015 Apple Inc. All rights reserved.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+const char* python = "/usr/bin/python2.7";
+const char* bin = "/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin";
+const char* site = "/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/lib/python2.7/site-packages";
+
+// Prepend a path to the named environment variable
+int prependToPath(const char* name, const char* prepend) {
+ const char* old_value = getenv(name);
+ char* new_value = NULL;
+ if (old_value == NULL) {
+ // No existing value - set to the prepend value
+ size_t max_length = strlen(prepend) + 1;
+ new_value = malloc(max_length);
+ strlcpy(new_value, prepend, max_length);
+ } else {
+ // Existing value - so prepend with a ":" in between
+ size_t max_length = strlen(old_value) + strlen(prepend) + 2;
+ new_value = malloc(max_length);
+ strlcpy(new_value, prepend, max_length);
+ strlcat(new_value, ":", max_length);
+ strlcat(new_value, old_value, max_length);
+ }
+ setenv(name, new_value, 1);
+ free(new_value);
+ return 0;
+}
+
+int main(int argc, const char * argv[]) {
+
+ // Update PATH and PYTHONPATH
+ prependToPath("PATH", bin);
+ prependToPath("PYTHONPATH", site);
+
+ // Launch real python
+ argv[0] = python;
+ return execvp(python, (char* const*)argv);
+}
</ins></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer62devsupportundovirtualenv"></a>
<div class="addfile"><h4>Added: CalendarServer/branches/release/CalendarServer-6.2-dev/support/undo-virtualenv (0 => 14987)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.2-dev/support/undo-virtualenv (rev 0)
+++ CalendarServer/branches/release/CalendarServer-6.2-dev/support/undo-virtualenv 2015-07-22 20:12:33 UTC (rev 14987)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+#!/bin/sh
+
+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+set -e
+set -u
+
+base="${1}";
+if [ $# == 1 ]; then
+ appbase="/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer";
+else
+ appbase="${2}";
+fi;
+
+# Remove python binaries
+rm -f "${base}/bin/python";
+rm -f "${base}/bin/python2";
+rm -f "${base}/bin/python2.7";
+
+# Remove unused virtualenv files
+rm -f "${base}/.Python";
+rm -f "${base}/include/python2.7";
+rm -f "${base}/lib/python2.7/"*.py*;
+rm -f "${base}/lib/python2.7/config";
+rm -rf "${base}/lib/python2.7/distutils";
+rm -f "${base}/lib/python2.7/encodings";
+rm -f "${base}/lib/python2.7/lib-dynload";
+rm -f "${base}/lib/python2.7/orig-prefix.txt";
+
+# Create links
+cd "${base}/bin"
+ln -s "python-wrapper" "python";
+ln -s "python-wrapper" "python2";
+ln -s "python-wrapper" "python2.7";
</ins><span class="cx">Property changes on: CalendarServer/branches/release/CalendarServer-6.2-dev/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>