<!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>[12989] 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/12989">12989</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-21 15:29:24 -0700 (Fri, 21 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>inch forward</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 (12988 => 12989)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make        2014-03-21 19:51:51 UTC (rev 12988)
+++ CalendarServer/trunk/support/Apple.make        2014-03-21 22:29:24 UTC (rev 12989)
</span><span class="lines">@@ -27,23 +27,28 @@
</span><span class="cx">
</span><span class="cx"> # Include common makefile targets for B&I
</span><span class="cx"> include $(MAKEFILEPATH)/CoreOS/ReleaseControl/Common.make
</span><del>-include /AppleInternal/ServerTools/ServerBuildVariables.xcconfig
</del><ins>+-include /AppleInternal/ServerTools/ServerBuildVariables.xcconfig
</ins><span class="cx">
</span><ins>+ifeq ($(RPCFILES),)
+SIPP = /Applications/Server.app/Contents/ServerRoot
+else
</ins><span class="cx"> SIPP = $(SERVER_INSTALL_PATH_PREFIX)
</span><ins>+endif
</ins><span class="cx"> SERVERSETUP = $(SIPP)$(NSSYSTEMDIR)$(NSLIBRARYSUBDIR)/ServerSetup
</span><span class="cx">
</span><span class="cx"> Cruft += .develop
</span><del>-Extra_Environment += PATH="$(SIPP)/usr/bin:$$PATH"
-Extra_Environment += PYTHONPATH="$(PY_TMP_LIB)"
</del><ins>+# Extra_Environment += PATH="$(SIPP)/usr/bin:$$PATH"
+# Extra_Environment += PYTHONPATH="$(CS_PY_LIBS)"
</ins><span class="cx">
</span><span class="cx"> CALDAVDSUBDIR = /caldavd
</span><span class="cx">
</span><span class="cx"> PYTHON = $(USRBINDIR)/python
</span><del>-PY_HOME = $(SIPP)$(SHAREDIR)$(CALDAVDSUBDIR)
-PY_TMP_LIB = $(DSTROOT)$(SIPP)/usr/share/caldavd/lib/python/
-PY_INSTALL_FLAGS = --root="$(DSTROOT)" --prefix="$(SIPP)" --install-lib="$(PY_HOME)/lib/python" --install-scripts="$(SIPP)$(LIBEXECDIR)$(CALDAVDSUBDIR)"
-CS_INSTALL_FLAGS = --install-scripts="$(SIPP)$(USRSBINDIR)" --install-data="$(SIPP)$(ETCDIR)"
-CS_BUILD_EXT_FLAGS = --include-dirs="$(SIPP)/usr/include" --library-dirs="$(SIPP)/usr/lib"
</del><ins>+CS_SHAREDIR = $(SHAREDIR)$(CALDAVDSUBDIR)
+CS_PY_LIBS = $(CS_SHAREDIR)/lib/python
+CS_LIBEXEC = $(SIPP)$(LIBEXECDIR)$(CALDAVDSUBDIR)
+# PY_INSTALL_FLAGS = --root="$(DSTROOT)" --prefix="$(SIPP)" --install-lib="$(CS_PY_LIBS)" --install-scripts="$(CS_LIBEXEC)"
+# CS_INSTALL_FLAGS = --install-scripts="$(SIPP)$(USRSBINDIR)" --install-data="$(SIPP)$(ETCDIR)"
+# CS_BUILD_EXT_FLAGS = --include-dirs="$(SIPP)/usr/include" --library-dirs="$(SIPP)/usr/lib"
</ins><span class="cx">
</span><span class="cx"> CS_USER = _calendar
</span><span class="cx"> CS_GROUP = _calendar
</span><span class="lines">@@ -52,39 +57,45 @@
</span><span class="cx"> # Build
</span><span class="cx"> #
</span><span class="cx">
</span><del>-.phony: $(Project) prep build install install-ossfiles buildit
</del><ins>+.phony: build install install_source install-ossfiles cache_deps buildit
</ins><span class="cx">
</span><del>-$(Project):: $(BuildDirectory)/$(Project)
-        @echo "Building $@..."
-        $(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
</del><ins>+build:: $(BuildDirectory)/$(Project)
+        # @echo "Building $(Project)...";
+        # $(_v) cd $(BuildDirectory)/$(Project) && $(Environment) $(PYTHON) setup.py build
</ins><span class="cx">
</span><del>-build:: $(Project)
-
</del><span class="cx"> install:: build
</span><del>-        $(_v) cd $(BuildDirectory)/$(Project) && \
-                $(Environment) $(PYTHON) setup.py \
-                build_ext $(CS_BUILD_EXT_FLAGS) \
-                install $(PY_INSTALL_FLAGS) $(CS_INSTALL_FLAGS) \
</del><ins>+        # $(_v) cd $(BuildDirectory)/$(Project) && \
+        #         $(Environment) $(PYTHON) setup.py \
+        #         build_ext $(CS_BUILD_EXT_FLAGS) \
+        #         install $(PY_INSTALL_FLAGS) $(CS_INSTALL_FLAGS) \
+        #        
+        @echo "Installing Python packages...";
+        $(_v) pip install -e $(BuildDirectory)/$(Project) \
+                --install-option --root="$(DSTROOT)" \
+                --install-option --prefix="$(SIPP)" \
+                --install-option --install-lib="$(CS_PY_LIBS)" \
+                --install-option --install-scripts="$(CS_LIBEXEC)" \
</ins><span class="cx">                
</span><del>-        $(_v) for so in $$(find "$(DSTROOT)$(PY_HOME)/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done;
</del><ins>+        @echo "Cleaning up...";
+        $(_v) for so in $$(find "$(DSTROOT)$(CS_SHAREDIR)/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done;
</ins><span class="cx">         $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)";
</span><span class="cx">         $(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist";
</span><del>-        $(_v) chmod -R ugo+r "$(DSTROOT)$(PY_HOME)";
</del><ins>+        $(_v) chmod -R ugo+r "$(DSTROOT)$(CS_SHAREDIR)";
</ins><span class="cx">         $(_v) for f in $$(find "$(DSTROOT)$(SIPP)$(ETCDIR)" -type f ! -name '*.default'); do cp "$${f}" "$${f}.default"; done;
</span><span class="cx">
</span><span class="cx"> install::
</span><del>-        @echo "Installing manual pages..."
-        $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/caldavd.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_command_gateway.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_export.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_manage_principals.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_attachments.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_events.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_principals.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_shell.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_manage_timezones.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
-        $(_v) gzip -9 -f "$(DSTROOT)$(SIPP)$(MANDIR)/man8/"*.[0-9]
</del><ins>+        @echo "Installing manual pages...";
+        $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/caldavd.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_command_gateway.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_export.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_manage_principals.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_attachments.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_events.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_principals.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_shell.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_manage_timezones.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8";
+        $(_v) gzip -9 -f "$(DSTROOT)$(SIPP)$(MANDIR)/man8/"*.[0-9];
</ins><span class="cx">
</span><span class="cx"> install::
</span><span class="cx">         @echo "Installing launchd config...";
</span><span class="lines">@@ -132,8 +143,10 @@
</span><span class="cx"> # B&I Hooey
</span><span class="cx"> #
</span><span class="cx">
</span><del>-buildit:
</del><ins>+cache_deps::
</ins><span class="cx">         @echo "Downloading dependencies...";
</span><del>-        $(_v) ./support/_cache_deps
</del><ins>+        $(_v) if [ ! -d requirements/cache ]; then ./support/_cache_deps ]; fi;
+
+buildit: cache_deps
</ins><span class="cx">         @echo "Running buildit...";
</span><span class="cx">         $(_v) sudo ~rc/bin/buildit $(CC_Archs) $(Sources);
</span></span></pre></div>
<a id="CalendarServertrunksupport_cache_deps"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/_cache_deps (12988 => 12989)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/_cache_deps        2014-03-21 19:51:51 UTC (rev 12988)
+++ CalendarServer/trunk/support/_cache_deps        2014-03-21 22:29:24 UTC (rev 12989)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> develop > /dev/null;
</span><span class="cx">
</span><ins>+rm -rf "${wd}/requirements/cache";
</ins><span class="cx"> mkdir "${wd}/requirements/cache";
</span><span class="cx">
</span><span class="cx"> find "${wd}/requirements" -type f -name "py_*.txt" |\
</span></span></pre>
</div>
</div>
</body>
</html>