You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 10:53:22 UTC
svn commit: r1132166 [3/3] - in /incubator/mesos/trunk: configure
configure.ac frameworks/mesos-submit/executor
frameworks/mesos-submit/mesos-submit src/examples/python/test_executor
src/examples/python/test_framework
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1132166&r1=1132165&r2=1132166&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun 5 08:53:21 2011
@@ -4,8 +4,9 @@
AC_PREREQ(2.61)
AC_INIT
-# Use explicit python version 2.6.
-PYTHON=python2.6
+if test -z "$PYTHON"; then
+ PYTHON=python2.6
+fi
# Update CFLAGS and CXXFLAGS with environment args.
CFLAGS="-O2 -fno-strict-aliasing -fPIC ${CFLAGS}"
@@ -64,7 +65,6 @@ case "${target_os}" in
CFLAGS="${CFLAGS} -pthreads -march=i586"
CXXFLAGS="${CXXFLAGS} -pthreads -march=i586"
LIBS="-lsocket -lnsl -lproject -lproc"
- PYTHON="python2.6"
OS_NAME=solaris
;;
*)
Modified: incubator/mesos/trunk/frameworks/mesos-submit/executor
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/mesos-submit/executor?rev=1132166&r1=1132165&r2=1132166&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/mesos-submit/executor (original)
+++ incubator/mesos/trunk/frameworks/mesos-submit/executor Sun Jun 5 08:53:21 2011
@@ -2,9 +2,6 @@
if [ "x$PYTHON" == "x" ]; then
PYTHON=python
- if [ "`uname`" == "SunOS" ]; then
- PYTHON=python2.6
- fi
fi
if [ "x$MESOS_HOME" == "x" ]; then
Modified: incubator/mesos/trunk/frameworks/mesos-submit/mesos-submit
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/mesos-submit/mesos-submit?rev=1132166&r1=1132165&r2=1132166&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/mesos-submit/mesos-submit (original)
+++ incubator/mesos/trunk/frameworks/mesos-submit/mesos-submit Sun Jun 5 08:53:21 2011
@@ -2,9 +2,6 @@
if [ "x$PYTHON" == "x" ]; then
PYTHON=python
- if [ "`uname`" == "SunOS" ]; then
- PYTHON=python2.6
- fi
fi
if [ "x$MESOS_HOME" == "x" ]; then
Modified: incubator/mesos/trunk/src/examples/python/test_executor
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/python/test_executor?rev=1132166&r1=1132165&r2=1132166&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/python/test_executor (original)
+++ incubator/mesos/trunk/src/examples/python/test_executor Sun Jun 5 08:53:21 2011
@@ -1,5 +1,8 @@
#!/bin/sh
+if [ "x$PYTHON" == "x" ]; then
+ PYTHON=python
+fi
FWDIR=`dirname $0`
MESOS_HOME=`cd $FWDIR/../../..; pwd`
export PYTHONPATH="$MESOS_HOME/lib/python:$PYTHONPATH"
-exec python2.6 $FWDIR/test_executor.py $@
+exec $PYTHON $FWDIR/test_executor.py $@
Modified: incubator/mesos/trunk/src/examples/python/test_framework
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/python/test_framework?rev=1132166&r1=1132165&r2=1132166&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/python/test_framework (original)
+++ incubator/mesos/trunk/src/examples/python/test_framework Sun Jun 5 08:53:21 2011
@@ -1,5 +1,8 @@
#!/bin/bash
+if [ "x$PYTHON" == "x" ]; then
+ PYTHON=python
+fi
FRAMEWORK_DIR="`cd $(dirname $0); pwd`"
MESOS_HOME="$FRAMEWORK_DIR/../../.."
export PYTHONPATH="$MESOS_HOME/lib/python:$PYTHONPATH"
-exec python2.6 $FRAMEWORK_DIR/test_framework.py $@
+exec $PYTHON $FRAMEWORK_DIR/test_framework.py $@