[CalendarServer-changes] [11395] CalendarServer/trunk/support

[source_changes at macosforge.org]

Revision: 11395
          http://trac.calendarserver.org//changeset/11395
Author:   wsanchez at apple.com
Date:     2013-06-24 10:59:29 -0700 (Mon, 24 Jun 2013)
Log Message:
-----------
Add CFFI

Modified Paths:
--------------
    CalendarServer/trunk/support/Apple.make
    CalendarServer/trunk/support/build.sh

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2013-06-24 16:57:26 UTC (rev 11394)
+++ CalendarServer/trunk/support/Apple.make	2013-06-24 17:59:29 UTC (rev 11395)
@@ -60,6 +60,7 @@
 SETPROCTITLE = setproctitle-1.1.6
 PSUTIL       = psutil-0.6.1
 PYCRYPTO     = pycrypto-2.5
+CFFI         = cffi-0.6
 
 $(CALDAVTESTER):: $(BuildDirectory)/$(CALDAVTESTER)
 $(PYKERBEROS)::   $(BuildDirectory)/$(PYKERBEROS)
@@ -69,16 +70,17 @@
 $(SETPROCTITLE):: $(BuildDirectory)/$(SETPROCTITLE)
 $(PSUTIL)::	  $(BuildDirectory)/$(PSUTIL)
 $(PYCRYPTO)::	  $(BuildDirectory)/$(PYCRYPTO)
+$(CFFI)::	  $(BuildDirectory)/$(CFFI)
 $(Project)::      $(BuildDirectory)/$(Project)
 
-build:: $(PYKERBEROS) $(PYCALENDAR) $(PYGRESQL) $(SQLPARSE) $(SETPROCTITLE) $(PSUTIL) $(PYCRYPTO) $(Project)
+build:: $(PYKERBEROS) $(PYCALENDAR) $(PYGRESQL) $(SQLPARSE) $(SETPROCTITLE) $(PSUTIL) $(PYCRYPTO) $(CFFI) $(Project)
 
 setup:
 	$(_v) ./run -g
 
-prep:: setup $(CALDAVTESTER).tgz $(PYKERBEROS).tgz $(PYCALENDAR).tgz $(PYGRESQL).tgz $(SQLPARSE).tgz $(SETPROCTITLE).tgz $(PSUTIL).tgz $(PYCRYPTO).tgz
+prep:: setup $(CALDAVTESTER).tgz $(PYKERBEROS).tgz $(PYCALENDAR).tgz $(PYGRESQL).tgz $(SQLPARSE).tgz $(SETPROCTITLE).tgz $(PSUTIL).tgz $(PYCRYPTO).tgz $(CFFI).tgz
 
-$(PYKERBEROS) $(PYCALENDAR) $(PYGRESQL) $(SQLPARSE) $(SETPROCTITLE) $(PSUTIL) $(PYCRYPTO) $(Project)::
+$(PYKERBEROS) $(PYCALENDAR) $(PYGRESQL) $(SQLPARSE) $(SETPROCTITLE) $(PSUTIL) $(PYCRYPTO) $(CFFI) $(Project)::
 	@echo "Building $@..."
 	$(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
 
@@ -91,6 +93,7 @@
 	$(_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)/$(CFFI)         && $(Environment) $(PYTHON) setup.py install $(PY_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"

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2013-06-24 16:57:26 UTC (rev 11394)
+++ CalendarServer/trunk/support/build.sh	2013-06-24 17:59:29 UTC (rev 11395)
@@ -854,6 +854,13 @@
     "${n}" "${n}" "${p}" \
     "${pypi}/s/${n}/${p}.tar.gz";
 
+  local v="0.6";
+  local n="cffi";
+  local p="${n}-${v}";
+  py_dependency -v "0.6" -m "5be33b1ab0247a984d42b27344519337" \
+    "${n}" "${n}" "${p}" \
+    "${pypi}/c/${n}/${p}.tar.gz";
+
   svn_get "CalDAVTester" "${top}/CalDAVTester" \
       "${svn_uri_base}/CalDAVTester/trunk" HEAD;
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130624/98d79977/attachment.html>