tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csuth...@apache.org
Subject svn commit: r1843685 - in /tomcat/native/trunk/native: build/buildcheck.sh buildconf
Date Fri, 12 Oct 2018 16:02:57 GMT
Author: csutherl
Date: Fri Oct 12 16:02:57 2018
New Revision: 1843685

URL: http://svn.apache.org/viewvc?rev=1843685&view=rev
Log:
Update buildconf and buildcheck.sh to detect and run under Python 3 or 2. Same logic as apr-1.7.x
uses, see commit apr r1834494.

Modified:
    tomcat/native/trunk/native/build/buildcheck.sh
    tomcat/native/trunk/native/buildconf

Modified: tomcat/native/trunk/native/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/buildcheck.sh?rev=1843685&r1=1843684&r2=1843685&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/buildcheck.sh (original)
+++ tomcat/native/trunk/native/build/buildcheck.sh Fri Oct 12 16:02:57 2018
@@ -19,14 +19,14 @@
 echo "buildconf: checking installation..."
 
 # any python
-python=`build/PrintPath python`
+python=${PYTHON-`build/PrintPath python3 python2 python`}
 if test -z "$python"; then
 echo "buildconf: python not found."
 echo "           You need python installed"
 echo "           to build Tomcat Native from SVN."
 exit 1
 else
-py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
+py_version=`$python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
 echo "buildconf: python version $py_version (ok)"
 fi
 

Modified: tomcat/native/trunk/native/buildconf
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/buildconf?rev=1843685&r1=1843684&r2=1843685&view=diff
==============================================================================
--- tomcat/native/trunk/native/buildconf (original)
+++ tomcat/native/trunk/native/buildconf Fri Oct 12 16:02:57 2018
@@ -79,8 +79,10 @@ fi
 #
 # Generate build-outputs.mk for the build systme
 #
+PYTHON=${PYTHON-`build/PrintPath python3 python2 python`}
+
 echo "Generating 'make' outputs ..."
-$apr_src_dir/build/gen-build.py make
+${PYTHON} $apr_src_dir/build/gen-build.py make
 if [ $? -gt 0 ]; then
   echo "Creating build-outputs.mk failed"
   exit 1



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message