<!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>[12985] 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/12985">12985</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-20 19:05:52 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use new tools.</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 (12984 => 12985)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make 2014-03-21 01:05:35 UTC (rev 12984)
+++ CalendarServer/trunk/support/Apple.make 2014-03-21 02:05:52 UTC (rev 12985)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> SIPP = $(SERVER_INSTALL_PATH_PREFIX)
</span><span class="cx"> SERVERSETUP = $(SIPP)$(NSSYSTEMDIR)$(NSLIBRARYSUBDIR)/ServerSetup
</span><span class="cx">
</span><del>-Cruft += .dependencies
</del><ins>+Cruft += .develop
</ins><span class="cx"> Extra_Environment += PATH="$(SIPP)/usr/bin:$$PATH"
</span><span class="cx"> Extra_Environment += PYTHONPATH="$(PY_TMP_LIB)"
</span><span class="cx">
</span><span class="lines">@@ -52,61 +52,25 @@
</span><span class="cx"> # Build
</span><span class="cx"> #
</span><span class="cx">
</span><del>-.phony: $(Project) pycalendar twext build setup prep install install-ossfiles buildit
</del><ins>+.phony: $(Project) prep build install install-ossfiles buildit
</ins><span class="cx">
</span><del>-CALDAVTESTER = CalDAVTester
-PYKERBEROS = PyKerberos-9409
-PYCALENDAR = PyCalendar-11947
-TWEXT = twext-12414
-PYGRESQL = PyGreSQL-4.1.1
-SQLPARSE = sqlparse-0.1.2
-SETPROCTITLE = setproctitle-1.1.8
-PSUTIL = psutil-1.2.0
-PYCRYPTO = pycrypto-2.6.1
-CFFI = cffi-0.6
-PYCPARSER = pycparser-2.10
</del><ins>+$(Project):: $(BuildDirectory)/$(Project)
+ @echo "Building $@..."
+ $(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
</ins><span class="cx">
</span><del>-$(CALDAVTESTER):: $(BuildDirectory)/$(CALDAVTESTER)
-$(PYKERBEROS):: $(BuildDirectory)/$(PYKERBEROS)
-$(PYCALENDAR):: $(BuildDirectory)/$(PYCALENDAR)
-$(TWEXT):: $(BuildDirectory)/$(TWEXT)
-$(PYGRESQL):: $(BuildDirectory)/$(PYGRESQL)
-$(SQLPARSE):: $(BuildDirectory)/$(SQLPARSE)
-$(SETPROCTITLE):: $(BuildDirectory)/$(SETPROCTITLE)
-$(PSUTIL):: $(BuildDirectory)/$(PSUTIL)
-$(PYCRYPTO):: $(BuildDirectory)/$(PYCRYPTO)
-$(CFFI):: $(BuildDirectory)/$(CFFI)
-$(PYCPARSER):: $(BuildDirectory)/$(PYCPARSER)
-$(Project):: $(BuildDirectory)/$(Project)
</del><ins>+build:: $(Project)
</ins><span class="cx">
</span><del>-build:: $(PYKERBEROS) $(PYCALENDAR) $(TWEXT) $(PYGRESQL) $(SQLPARSE) $(SETPROCTITLE) $(PSUTIL) $(PYCRYPTO) $(CFFI) $(PYCPARSER) $(Project)
-
-setup:
- $(_v) ./run -g
-
-prep:: setup $(CALDAVTESTER).tgz $(PYKERBEROS).tgz $(PYCALENDAR).tgz $(TWEXT).tgz $(PYGRESQL).tgz $(SQLPARSE).tgz $(SETPROCTITLE).tgz $(PSUTIL).tgz $(PYCRYPTO).tgz $(CFFI).tgz $(PYCPARSER).tgz
-
-# $(PYKERBEROS) $(PYCALENDAR) $(PYGRESQL) $(SQLPARSE) $(SETPROCTITLE) $(PSUTIL) $(PYCRYPTO) $(CFFI) $(PYCPARSER) $(Project)::
-# @echo "Building $@..."
-# $(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
-
</del><span class="cx"> install:: build
</span><del>- $(_v) cd $(BuildDirectory)/$(PYKERBEROS) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(PYCALENDAR) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(TWEXT) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(PYGRESQL) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(SQLPARSE) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(SETPROCTITLE) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(PSUTIL) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(PYCRYPTO) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(PYCPARSER) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(CFFI) && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/$(Project) && $(Environment) $(PYTHON) setup.py build_ext $(CS_BUILD_EXT_FLAGS) install $(PY_INSTALL_FLAGS) $(CS_INSTALL_FLAGS)
- $(_v) for so in $$(find "$(DSTROOT)$(PY_HOME)/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)"
- $(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist"
- $(_v) chmod -R ugo+r "$(DSTROOT)$(PY_HOME)"
- $(_v) for f in $$(find "$(DSTROOT)$(SIPP)$(ETCDIR)" -type f ! -name '*.default'); do cp "$${f}" "$${f}.default"; done
</del><ins>+ $(_v) cd $(BuildDirectory)/$(Project) && \
+ $(Environment) $(PYTHON) setup.py \
+ build_ext $(CS_BUILD_EXT_FLAGS) \
+ install $(PY_INSTALL_FLAGS) $(CS_INSTALL_FLAGS) \
+
+ $(_v) for so in $$(find "$(DSTROOT)$(PY_HOME)/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done;
+ $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)";
+ $(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist";
+ $(_v) chmod -R ugo+r "$(DSTROOT)$(PY_HOME)";
+ $(_v) for f in $$(find "$(DSTROOT)$(SIPP)$(ETCDIR)" -type f ! -name '*.default'); do cp "$${f}" "$${f}.default"; done;
</ins><span class="cx">
</span><span class="cx"> install::
</span><span class="cx"> @echo "Installing manual pages..."
</span><span class="lines">@@ -115,58 +79,40 @@
</span><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_command_gateway.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</span><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_export.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</span><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_manage_principals.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</span><del>- $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_migrate_resources.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</del><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_attachments.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</span><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_events.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</span><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_principals.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</span><del>- $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_manage_push.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</del><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_shell.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</span><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_manage_timezones.8" "$(DSTROOT)$(SIPP)$(MANDIR)/man8"
</span><span class="cx"> $(_v) gzip -9 -f "$(DSTROOT)$(SIPP)$(MANDIR)/man8/"*.[0-9]
</span><del>- @echo "Installing launchd config..."
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(NSLOCALDIR)/$(NSLIBRARYSUBDIR)/Server/Calendar and Contacts"
- $(_v) $(INSTALL_DIRECTORY) -o "$(CS_USER)" -g "$(CS_GROUP)" -m 0755 "$(DSTROOT)$(VARDIR)/log$(CALDAVDSUBDIR)"
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(NSLIBRARYDIR)/LaunchDaemons"
- $(_v) $(INSTALL_FILE) "$(Sources)/contrib/launchd/calendarserver.plist" "$(DSTROOT)$(SIPP)$(NSLIBRARYDIR)/LaunchDaemons/org.calendarserver.calendarserver.plist"
- @echo "Installing changeip script..."
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip"
- $(_v) $(INSTALL_FILE) "$(Sources)/calendarserver/tools/changeip_calendar.py" "$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip/changeip_calendar.py"
- $(_v) chmod ugo+x "$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip/changeip_calendar.py"
</del><span class="cx">
</span><span class="cx"> install::
</span><del>- @echo "Installing CalDAVTester package..."
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/AppleInternal/ServerTools"
- $(_v) $(TAR) -C "$(DSTROOT)/AppleInternal/ServerTools" -xzf "$(Sources)/CalDAVTester.tgz"
</del><ins>+ @echo "Installing launchd config...";
+ $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(NSLOCALDIR)/$(NSLIBRARYSUBDIR)/Server/Calendar and Contacts";
+ $(_v) $(INSTALL_DIRECTORY) -o "$(CS_USER)" -g "$(CS_GROUP)" -m 0755 "$(DSTROOT)$(VARDIR)/log$(CALDAVDSUBDIR)";
+ $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(NSLIBRARYDIR)/LaunchDaemons";
+ $(_v) $(INSTALL_FILE) "$(Sources)/contrib/launchd/calendarserver.plist" "$(DSTROOT)$(SIPP)$(NSLIBRARYDIR)/LaunchDaemons/org.calendarserver.calendarserver.plist";
</ins><span class="cx">
</span><ins>+install::
+ @echo "Installing changeip script...";
+ $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip";
+ $(_v) $(INSTALL_FILE) "$(Sources)/calendarserver/tools/changeip_calendar.py" "$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip/changeip_calendar.py";
+ $(_v) chmod ugo+x "$(DSTROOT)$(SIPP)$(LIBEXECDIR)/changeip/changeip_calendar.py";
+
+install::
+ @echo "Installing CalDAVTester package...";
+ $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/AppleInternal/ServerTools";
+ $(_v) cd "$(DSTROOT)/AppleInternal/ServerTools" && unzip "$(BuildDirectory)/$(Project)/requirements/cache/CalDAVTester-*.zip";
+
</ins><span class="cx"> #
</span><span class="cx"> # Automatic Extract
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> $(BuildDirectory)/$(Project):
</span><del>- @echo "Copying source for $(Project)..."
- $(_v) $(MKDIR) -p "$@"
- $(_v) pax -rw bin conf Makefile lib-patches setup.py calendarserver twistedcaldav txdav txweb2 twisted support "$@/"
</del><ins>+ @echo "Copying source for $(Project) to build directory...";
+ $(_v) $(MKDIR) -p "$@";
+ $(_v) cp -a "$(Sources)/" "$@/";
</ins><span class="cx">
</span><del>-$(BuildDirectory)/%: %.tgz
- @echo "Extracting source for $(notdir $<)..."
- $(_v) $(MKDIR) -p "$(BuildDirectory)"
- $(_v) $(RMDIR) "$@"
- $(_v) $(TAR) -C "$(BuildDirectory)" -xzf "$<"
-
-%.tgz: ../%
- @echo "Archiving sources for $(notdir $<)..."
- $(_v) if [ -f "$</setup.py" ] && grep setuptools "$</setup.py" > /dev/null; then \
- echo "Working around setuptools' stupid need to download a new version."; \
- cd "$<" && $(Environment) $(PYTHON) "setup.py" --help >/dev/null; \
- fi
- $(_v) $(TAR) -C "$(dir $<)" \
- --exclude=.svn \
- --exclude=build \
- --exclude=_trial_temp \
- --exclude=dropin.cache \
- --exclude='*.exe' \
- -czf "$@" "$(notdir $<)"
-
</del><span class="cx"> #
</span><span class="cx"> # Open Source Hooey
</span><span class="cx"> #
</span><span class="lines">@@ -177,15 +123,17 @@
</span><span class="cx"> #install:: install-ossfiles
</span><span class="cx">
</span><span class="cx"> install-ossfiles::
</span><del>- $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSV)
- $(_v) $(INSTALL_FILE) $(Sources)/$(ProjectName).plist $(DSTROOT)/$(OSV)/$(ProjectName).plist
- $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSL)
- $(_v) $(INSTALL_FILE) $(BuildDirectory)/$(Project)/LICENSE $(DSTROOT)/$(OSL)/$(ProjectName).txt
</del><ins>+ $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSV);
+ $(_v) $(INSTALL_FILE) $(Sources)/$(ProjectName).plist $(DSTROOT)/$(OSV)/$(ProjectName).plist;
+ $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSL);
+ $(_v) $(INSTALL_FILE) $(BuildDirectory)/$(Project)/LICENSE $(DSTROOT)/$(OSL)/$(ProjectName).txt;
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # B&I Hooey
</span><span class="cx"> #
</span><span class="cx">
</span><del>-buildit: prep
- @echo "Running buildit..."
- $(_v) sudo ~rc/bin/buildit $(CC_Archs) $(Sources)
</del><ins>+buildit:
+ @echo "Downloading dependencies...";
+ $(_v) ./support/_cache_deps
+ @echo "Running buildit...";
+ $(_v) sudo ~rc/bin/buildit $(CC_Archs) $(Sources);
</ins></span></pre></div>
<a id="CalendarServertrunksupport_cache_deps"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/_cache_deps (12984 => 12985)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/_cache_deps 2014-03-21 01:05:35 UTC (rev 12984)
+++ CalendarServer/trunk/support/_cache_deps 2014-03-21 02:05:52 UTC (rev 12985)
</span><span class="lines">@@ -30,16 +30,19 @@
</span><span class="cx">
</span><span class="cx"> mkdir "${wd}/requirements/cache";
</span><span class="cx">
</span><del>-find "${wd}/requirements" -type f -name "py_*.txt" | while read requirements; do
- case "${requirements}" in
- */py_opt_OpenDirectory.txt) download=false; ;;
- */py_opt_Oracle.txt) download=false; ;;
- *) download=true; ;;
- esac;
</del><ins>+find "${wd}/requirements" -type f -name "py_*.txt" |\
+ while read requirements; do
+ case "${requirements}" in
+ */py_opt_OpenDirectory.txt) download=false; ;;
+ */py_opt_Oracle.txt) download=false; ;;
+ *) download=true; ;;
+ esac;
</ins><span class="cx">
</span><del>- if "${download}"; then
- echo "Downloading requirements from: ${requirements}";
</del><ins>+ if "${download}"; then
+ echo "Downloading requirements from: ${requirements}";
</ins><span class="cx">
</span><del>- "${python}" -m pip install --download "${wd}/requirements/cache" --requirement "${requirements}";
- fi;
-done;
</del><ins>+ "${python}" -m pip install \
+ --download "${wd}/requirements/cache" \
+ --requirement "${requirements}";
+ fi;
+ done;
</ins></span></pre>
</div>
</div>
</body>
</html>