diff options
author | Joe Orton <jorton@apache.org> | 2018-06-27 11:41:30 +0000 |
---|---|---|
committer | Joe Orton <jorton@apache.org> | 2018-06-27 11:41:30 +0000 |
commit | bbf93347820c477188a7651d5aff6f303bedfa98 (patch) | |
tree | a9720c6744c8cfe74d203e3ac69d701209f7b2a4 /build/buildcheck.sh | |
parent | 71507ba0ae1389f199ea5f0705915c4b078f0e25 (diff) | |
download | apr-bbf93347820c477188a7651d5aff6f303bedfa98.tar.gz |
* build/buildcheck.sh, buildconf: Detect and run under Python 3 or 2,
and respect $PYTHON.
* build/gen-build.py: Fix various Python 3 compatibility issues.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1834494 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/buildcheck.sh')
-rwxr-xr-x | build/buildcheck.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/buildcheck.sh b/build/buildcheck.sh index ab5df445c..76ff8cef2 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -4,14 +4,14 @@ echo "buildconf: checking installation..." res=0 # 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 APR from SVN." res=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 |