[CalendarServer-changes] [9326] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Jun 4 15:14:46 PDT 2012


Revision: 9326
          http://trac.macosforge.org/projects/calendarserver/changeset/9326
Author:   glyph at apple.com
Date:     2012-06-04 15:14:45 -0700 (Mon, 04 Jun 2012)
Log Message:
-----------
Support relocating the dependency build area via CALENDARSERVER_BUILD_DEPS.

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

Property Changed:
----------------
    CalendarServer/trunk/

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2012-06-02 01:11:11 UTC (rev 9325)
+++ CalendarServer/trunk/support/build.sh	2012-06-04 22:14:45 UTC (rev 9326)
@@ -59,6 +59,7 @@
   conditional_set wd "$(pwd)";
   conditional_set config "${wd}/conf/caldavd-dev.plist";
   conditional_set caldav "${wd}";
+  conditional_set CALENDARSERVER_BUILD_DEPS "${caldav}/..";
 
   if [ -z "${CALENDARSERVER_CACHE_DEPS-}" ]; then
     cache_deps="${wd}/.dependencies";
@@ -66,6 +67,9 @@
     cache_deps="${CALENDARSERVER_CACHE_DEPS}";
   fi;
 
+  mkdir -p "${CALENDARSERVER_BUILD_DEPS}";
+  top="$(cd "${CALENDARSERVER_BUILD_DEPS}" && pwd -L)";
+
   if [ -z "${caldavd_wrapper_command:-}" ]; then
     if [ "$(uname -s)" == "Darwin" ] && [ "$(uname -r | cut -d . -f 1)" -ge 9 ]; then
       caldavd_wrapper_command="launchctl bsexec /";
@@ -74,7 +78,6 @@
     fi;
   fi;
 
-      top="$(cd "${caldav}/.." && pwd -L)";
   patches="${caldav}/lib-patches";
 
   # Find a command that can hash up a string for us
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120604/a11a9c73/attachment.html>


More information about the calendarserver-changes mailing list