[CalendarServer-changes] [13386] CalendarServer/trunk/bin/_build.sh

[source_changes at macosforge.org]

Revision: 13386
          http://trac.calendarserver.org//changeset/13386
Author:   wsanchez at apple.com
Date:     2014-04-30 15:08:49 -0700 (Wed, 30 Apr 2014)
Log Message:
-----------
Set python/PYTHON to bootstrap_python initially, then to the ve python in py_dependencies.

Modified Paths:
--------------
    CalendarServer/trunk/bin/_build.sh

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-04-30 19:22:22 UTC (rev 13385)
+++ CalendarServer/trunk/bin/_build.sh	2014-04-30 22:08:49 UTC (rev 13386)
@@ -90,7 +90,7 @@
   py_virtualenv="${dev_home}/virtualenv";
       py_bindir="${py_virtualenv}/bin";
 
-  python="${py_bindir}/python";
+  python="${bootstrap_python}";
   export PYTHON="${python}";
 
   if [ -z "${TWEXT_PKG_CACHE-}" ]; then
@@ -99,10 +99,6 @@
     dep_packages="${TWEXT_PKG_CACHE}";
   fi;
 
-  if [ ! -d "${py_virtualenv}" ]; then
-    "${bootstrap_python}" -m virtualenv --system-site-packages "${py_virtualenv}";
-  fi;
-
   project="$(setup_print name)";
 
   export _DEVELOP_PROJECT_="${project}";
@@ -154,7 +150,7 @@
 setup_print () {
   what="$1"; shift;
 
-  PYTHONPATH="${wd}:${PYTHONPATH:-}" "${python}" - << EOF
+  PYTHONPATH="${wd}:${PYTHONPATH:-}" "${bootstrap_python}" - << EOF
 from __future__ import print_function
 import setup
 print(setup.${what})
@@ -589,14 +585,17 @@
 # Build Python dependencies
 #
 py_dependencies () {
+  python="${py_bindir}/python";
+
   export PATH="${py_virtualenv}/bin:${PATH}";
+  export PYTHON="${python}";
   export PYTHONPATH="${wd}:${PYTHONPATH:-}";
 
   # Work around a change in Xcode tools that breaks Python modules in OS X
   # 10.9.2 and prior due to a hard error if the -mno-fused-madd is used, as
   # it was in the system Python, and is therefore passed along by disutils.
   if [ "$(uname -s)" = "Darwin" ]; then
-    if "${python}" -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("CFLAGS")' \
+    if "${bootstrap_python}" -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("CFLAGS")' \
        | grep -e -mno-fused-madd > /dev/null; then
       export ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future";
     fi;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140430/16d9c054/attachment.html>