<!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>[13340] 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/13340">13340</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-20 16:23:23 -0700 (Sun, 20 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>clean up installation</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 (13339 => 13340)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make        2014-04-19 19:25:10 UTC (rev 13339)
+++ CalendarServer/trunk/support/Apple.make        2014-04-20 23:23:23 UTC (rev 13340)
</span><span class="lines">@@ -100,32 +100,17 @@
</span><span class="cx">         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(CS_VIRTUALENV)/etc&quot;;
</span><span class="cx">         $(_v) $(INSTALL_FILE) &quot;$(Sources)/conf/caldavd-apple.plist&quot; &quot;$(DSTROOT)$(CS_VIRTUALENV)/etc/caldavd.plist&quot;;
</span><span class="cx"> 
</span><ins>+install:: install-commands
+install-commands::
+        @echo &quot;Installing links to executables...&quot;;
+        $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(SIPP)/usr/bin&quot;;
+        $(_v) ln -fs &quot;../..$(NSLOCALDIR)$(NSLIBRARYSUBDIR)/CalendarServer/bin/caldavd&quot; &quot;$(DSTROOT)$(SIPP)/usr/sbin&quot;;
+        $(_v) cd &quot;$(DSTROOT)$(SIPP)/usr/bin/&quot; &amp;&amp;                                                         \
+              for cmd in &quot;../..$(NSLOCALDIR)$(NSLIBRARYSUBDIR)/CalendarServer/bin/calendarserver_&quot;*; do  \
+                  ln -fs &quot;$${cmd}&quot; .;                                                                    \
+              done;
</ins><span class="cx"> 
</span><del>-# install-oldish::
-#         @echo &quot;Installing Python packages...&quot;;
-#         $(_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;                  \
-#                 --ignore-installed                                                                                                        \
-#                 
-#         $(_v) cd $(BuildDirectory)/$(Project) &amp;&amp; \
-#                 $(Environment) $(PYTHON) setup.py \
-#                 build_ext $(CS_BUILD_EXT_FLAGS) \
-#                 install $(PY_INSTALL_FLAGS) $(CS_INSTALL_FLAGS) \
-#                 
-#         @echo &quot;Cleaning up...&quot;;
-#         $(_v) for so in $$(find &quot;$(DSTROOT)$(CS_SHAREDIR)/lib&quot; -type f -name '*.so'); do $(STRIP) -Sx &quot;$${so}&quot;; done;
-#         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)&quot;;
-#         $(_v) $(INSTALL_FILE) &quot;$(Sources)/conf/caldavd-apple.plist&quot; &quot;$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist&quot;;
-#         $(_v) chmod -R ugo+r &quot;$(DSTROOT)$(CS_SHAREDIR)&quot;;
-#         $(_v) for f in $$(find &quot;$(DSTROOT)$(SIPP)$(ETCDIR)&quot; -type f ! -name '*.default'); do cp &quot;$${f}&quot; &quot;$${f}.default&quot;; done;
-
-# install:: install-man
</del><ins>+install:: install-man
</ins><span class="cx"> install-man::
</span><span class="cx">         @echo &quot;Installing manual pages...&quot;;
</span><span class="cx">         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8&quot;;
</span><span class="lines">@@ -140,26 +125,23 @@
</span><span class="cx">         $(_v) $(INSTALL_FILE) &quot;$(Sources)/doc/calendarserver_manage_timezones.8&quot;   &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8&quot;;
</span><span class="cx">         $(_v) gzip -9 -f &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8/&quot;*.[0-9];
</span><span class="cx"> 
</span><del>-# install:: install-launchd
</del><ins>+install:: install-launchd
</ins><span class="cx"> install-launchd::
</span><span class="cx">         @echo &quot;Installing launchd config...&quot;;
</span><del>-        $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(NSLOCALDIR)/$(NSLIBRARYSUBDIR)/Server/Calendar and Contacts&quot;;
-        $(_v) $(INSTALL_DIRECTORY) -o &quot;$(CS_USER)&quot; -g &quot;$(CS_GROUP)&quot; -m 0755 &quot;$(DSTROOT)$(VARDIR)/log$(CALDAVDSUBDIR)&quot;;
</del><span class="cx">         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(SIPP)$(NSLIBRARYDIR)/LaunchDaemons&quot;;
</span><span class="cx">         $(_v) $(INSTALL_FILE) &quot;$(Sources)/contrib/launchd/calendarserver.plist&quot; &quot;$(DSTROOT)$(SIPP)$(NSLIBRARYDIR)/LaunchDaemons/org.calendarserver.calendarserver.plist&quot;;
</span><span class="cx"> 
</span><del>-# install:: install-changeip
</del><ins>+install:: install-changeip
</ins><span class="cx"> install-changeip::
</span><span class="cx">         @echo &quot;Installing changeip script...&quot;;
</span><span class="cx">         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip&quot;;
</span><del>-        $(_v) $(INSTALL_FILE) &quot;$(Sources)/calendarserver/tools/changeip_calendar.py&quot; &quot;$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip/changeip_calendar.py&quot;;
-        $(_v) chmod ugo+x &quot;$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip/changeip_calendar.py&quot;;
</del><ins>+        $(_v) $(INSTALL_SCRIPT) &quot;$(Sources)/calendarserver/tools/changeip_calendar.py&quot; &quot;$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip/changeip_calendar&quot;;
</ins><span class="cx"> 
</span><span class="cx"> # install:: install-caldavtester
</span><del>-install-caldavtester::
-        @echo &quot;Installing CalDAVTester package...&quot;;
-        $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)/AppleInternal/ServerTools&quot;;
-        $(_v) cd &quot;$(DSTROOT)/AppleInternal/ServerTools&quot; &amp;&amp; unzip &quot;$(BuildDirectory)/$(Project)/requirements/cache/CalDAVTester-*.zip&quot;;
</del><ins>+# install-caldavtester::
+#         @echo &quot;Installing CalDAVTester package...&quot;;
+#         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)/AppleInternal/ServerTools&quot;;
+#         $(_v) cd &quot;$(DSTROOT)/AppleInternal/ServerTools&quot; &amp;&amp; unzip &quot;$(BuildDirectory)/$(Project)/requirements/cache/CalDAVTester-*.zip&quot;;
</ins><span class="cx"> 
</span><span class="cx"> #
</span><span class="cx"> # Automatic Extract
</span><span class="lines">@@ -178,7 +160,6 @@
</span><span class="cx"> OSL = $(USRDIR)/local/OpenSourceLicenses
</span><span class="cx"> 
</span><span class="cx"> #install:: install-ossfiles
</span><del>-
</del><span class="cx"> install-ossfiles::
</span><span class="cx">         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)/$(OSV)&quot;;
</span><span class="cx">         $(_v) $(INSTALL_FILE) &quot;$(Sources)/$(ProjectName).plist&quot; &quot;$(DSTROOT)/$(OSV)/$(ProjectName).plist&quot;;
</span></span></pre>
</div>
</div>

</body>
</html>