[CalendarServer-changes] [695] CalendarServer/branches/SACLs/run

[source_changes at macosforge.org]

Revision: 695
          http://trac.macosforge.org/projects/calendarserver/changeset/695
Author:   wsanchez at apple.com
Date:     2006-12-05 11:29:18 -0800 (Tue, 05 Dec 2006)

Log Message:
-----------
Don't build stuff that won't build.

Modified Paths:
--------------
    CalendarServer/branches/SACLs/run

Modified: CalendarServer/branches/SACLs/run
===================================================================
--- CalendarServer/branches/SACLs/run	2006-12-05 19:15:20 UTC (rev 694)
+++ CalendarServer/branches/SACLs/run	2006-12-05 19:29:18 UTC (rev 695)
@@ -150,6 +150,12 @@
   install="$(pwd)/${install}";
 fi;
 
+svn_uri_base="$(svn info "${caldav}" --xml 2>/dev/null | sed -n 's|^.*<root>\(.*\)</root>.*$|\1|p')";
+
+if [ -z "${svn_uri_base}" ]; then
+  svn_uri_base="http://svn.macosforge.org/repository/calendarserver";
+fi;
+
 ##
 # Download and set up dependancies
 ##
@@ -372,50 +378,48 @@
 # PyKerberos
 #
 
-svn_uri_base="$(svn info "${caldav}" --xml 2>/dev/null | sed -n 's|^.*<root>\(.*\)</root>.*$|\1|p')";
+if type krb5-config > /dev/null; then
+  if ! py_have_module kerberos; then
+    kerberos="${top}/PyKerberos";
 
-if [ -z "${svn_uri_base}" ]; then
-  svn_uri_base="http://svn.macosforge.org/repository/calendarserver";
-fi;
+    svn_get "PyKerberos" "${kerberos}" "${svn_uri_base}/PyKerberos/trunk" 202;
+    py_build "PyKerberos" "${kerberos}" false; # FIXME: make optional
+    py_install "PyKerberos" "${kerberos}";
 
-if ! py_have_module kerberos; then
-  kerberos="${top}/PyKerberos";
-
-  svn_get "PyKerberos" "${kerberos}" "${svn_uri_base}/PyKerberos/trunk" 202;
-  py_build "PyKerberos" "${kerberos}" false; # FIXME: make optional
-  py_install "PyKerberos" "${kerberos}";
-
-  export PYTHONPATH="${PYTHONPATH}:${kerberos}/build/${py_platform_libdir}";
+    export PYTHONPATH="${PYTHONPATH}:${kerberos}/build/${py_platform_libdir}";
+  fi;
 fi;
 
 #
 # PyOpenDirectory
 #
 
-if ! py_have_module opendirectory; then
-  opendirectory="${top}/PyOpenDirectory";
+if [ "$(uname -s)" == "Darwin" ]; then
+  if ! py_have_module opendirectory; then
+    opendirectory="${top}/PyOpenDirectory";
 
-  svn_get "PyOpenDirectory" "${opendirectory}" "${svn_uri_base}/PyOpenDirectory/trunk" 31;
-  py_build "PyOpenDirectory" "${opendirectory}" false; # FIXME: make optional
-  py_install "PyOpenDirectory" "${opendirectory}";
+    svn_get "PyOpenDirectory" "${opendirectory}" "${svn_uri_base}/PyOpenDirectory/trunk" 31;
+    py_build "PyOpenDirectory" "${opendirectory}" false;
+    py_install "PyOpenDirectory" "${opendirectory}";
 
-  export PYTHONPATH="${PYTHONPATH}:${opendirectory}/build/${py_platform_libdir}";
+    export PYTHONPATH="${PYTHONPATH}:${opendirectory}/build/${py_platform_libdir}";
+  fi;
 fi;
 
 #
 # PyAppleAuth
 #
 
-if [ `uname -s` == "Darwin" ]; then
-    if ! py_have_module appleauth; then
-        appleauth="${top}/PyAppleAuth";
+if [ "$(uname -s)" == "Darwin" ]; then
+  if ! py_have_module appleauth; then
+    appleauth="${top}/PyAppleAuth";
 
-        svn_get "PyAppleAuth" "${appleauth}" "${svn_uri_base}/PyAppleAuth/trunk" 656;
-        py_build "PyAppleAuth" "${appleauth}" false; # FIXME: make optional
-        py_install "PyAppleAuth" "${appleauth}"
+    svn_get "PyAppleAuth" "${appleauth}" "${svn_uri_base}/PyAppleAuth/trunk" 656;
+    py_build "PyAppleAuth" "${appleauth}" false;
+    py_install "PyAppleAuth" "${appleauth}"
 
-        export PYTHONPATH="${PYTHONPATH}:${appleauth}/build/${py_platform_libdir}";
-    fi;
+    export PYTHONPATH="${PYTHONPATH}:${appleauth}/build/${py_platform_libdir}";
+  fi;
 fi;
 
 #

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061205/9a0acc04/attachment.html