[CalendarServer-changes] [13376] CalendarServer/trunk/bin/_build.sh
source_changes at macosforge.org
source_changes at macosforge.org
Mon Apr 28 16:39:32 PDT 2014
Revision: 13376
http://trac.calendarserver.org//changeset/13376
Author: wsanchez at apple.com
Date: 2014-04-28 16:39:32 -0700 (Mon, 28 Apr 2014)
Log Message:
-----------
PYTHON/PYTHONPATH cleanup
Modified Paths:
--------------
CalendarServer/trunk/bin/_build.sh
Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh 2014-04-26 15:10:28 UTC (rev 13375)
+++ CalendarServer/trunk/bin/_build.sh 2014-04-28 23:39:32 UTC (rev 13376)
@@ -91,6 +91,7 @@
py_bindir="${py_virtualenv}/bin";
python="${py_bindir}/python";
+ export PYTHON="${python}";
if [ -z "${TWEXT_PKG_CACHE-}" ]; then
dep_packages="${dev_home}/pkg";
@@ -153,7 +154,7 @@
setup_print () {
what="$1"; shift;
- PYTHONPATH="${wd}" "${python}" - << EOF
+ PYTHONPATH="${wd}:${PYTHONPATH:-}" "${python}" - << EOF
from __future__ import print_function
import setup
print(setup.${what})
@@ -589,7 +590,6 @@
#
py_dependencies () {
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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140428/f47cbf76/attachment.html>
More information about the calendarserver-changes
mailing list