[CalendarServer-changes] [15239] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15239
          http://trac.calendarserver.org//changeset/15239
Author:   cdaboo at apple.com
Date:     2015-10-27 08:56:29 -0700 (Tue, 27 Oct 2015)
Log Message:
-----------
Fix cffi dependency and make sure it builds properly.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-cs.txt
    CalendarServer/trunk/requirements-twisted-osx.txt
    CalendarServer/trunk/support/Apple.make

Modified: CalendarServer/trunk/requirements-cs.txt
===================================================================
--- CalendarServer/trunk/requirements-cs.txt	2015-10-27 15:55:27 UTC (rev 15238)
+++ CalendarServer/trunk/requirements-cs.txt	2015-10-27 15:56:29 UTC (rev 15239)
@@ -8,8 +8,8 @@
 	    setuptools==17.0
 
     --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15216#egg=twextpy
-        #cffi==1.1.0
-        #    pycparser==2.13
+        cffi==1.1.0
+            pycparser==2.13
         #twisted
 
         # [LDAP] extra

Modified: CalendarServer/trunk/requirements-twisted-osx.txt
===================================================================
--- CalendarServer/trunk/requirements-twisted-osx.txt	2015-10-27 15:55:27 UTC (rev 15238)
+++ CalendarServer/trunk/requirements-twisted-osx.txt	2015-10-27 15:56:29 UTC (rev 15239)
@@ -6,9 +6,9 @@
     #zope.interface
     pycrypto==2.6.1
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/OSXFrameworks/trunk@15236#egg=osxframeworks
-        cffi==1.1.0
-            pycparser==2.13
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/OSXFrameworks/trunk@15238#egg=osxframeworks
+        #cffi==1.1.0
+        #    pycparser==2.13
 
     --editable svn+http://svn.calendarserver.org/repository/calendarserver/PySecureTransport/trunk@15229#egg=pysecuretransport
 

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2015-10-27 15:55:27 UTC (rev 15238)
+++ CalendarServer/trunk/support/Apple.make	2015-10-27 15:56:29 UTC (rev 15239)
@@ -38,6 +38,7 @@
 
 # Cruft += .develop
 Extra_Environment += PATH="$(SIPP)/usr/bin:$$PATH"
+Extra_Environment += C_INCLUDE_PATH="$(Sources)/.develop/roots/c_glue/include:$$C_INCLUDE_PATH"
 # Extra_Environment += PYTHONPATH="$(CS_PY_LIBS)"
 
 CALDAVDSUBDIR = /caldavd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151027/c293ce74/attachment-0001.html>