Adjust core scripts to use python3/python/python2

---
Signed-off-by: Michael Ferguson <mppf@users.noreply.github.com>

Makefile

@@ -49,7 +49,7 @@ MAKEFLAGS = --no-print-directory
 
 export CHPL_MAKE_HOME=$(shell pwd)
 
-NEEDS_LLVM_RUNTIME=${CHPL_MAKE_HOME}/util/chplenv/chpl_llvm.py \
+NEEDS_LLVM_RUNTIME=$(CHPL_MAKE_PYTHON) ${CHPL_MAKE_HOME}/util/chplenv/chpl_llvm.py \
                     --needs-llvm-runtime
 
 default: all

Makefile.devel

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PYTHON_VERSION_DIR = py$(shell $(CHPL_MAKE_HOME)/util/chplenv/chpl_python_version.py)
+PYTHON_VERSION_DIR = py$(shell $(CHPL_MAKE_PYTHON) $(CHPL_MAKE_HOME)/util/chplenv/chpl_python_version.py)
 
 develall:
 	@$(MAKE) always-build-man

compiler/Makefile

@@ -113,7 +113,8 @@ ifndef CHPL_MAKE_THIRD_PARTY
 CHPL_MAKE_THIRD_PARTY = $(CHPL_MAKE_HOME)/third-party
 endif
 
-FIXPATH_CMD := $(CHPL_MAKE_HOME)/util/config/replace-paths.py \
+FIXPATH_CMD := $(CHPL_MAKE_PYTHON) \
+                  $(CHPL_MAKE_HOME)/util/config/replace-paths.py \
                   --fixpath '$$CHPL_THIRD_PARTY' $(CHPL_MAKE_THIRD_PARTY) \
                   --fixpath '$$CHPL_HOME' $(CHPL_MAKE_HOME)
 
@@ -146,11 +147,11 @@ $(CHPL_MAKE_HOME)/configured-prefix:
 
 $(CONFIGURED_PREFIX_FILE): FORCE $(COMPILER_BUILD) $(CHPL_MAKE_HOME)/configured-prefix
 	@echo '"'`cat $(CHPL_MAKE_HOME)/configured-prefix`'"' \ > $(CONFIGURED_PREFIX_FILE).incoming
-	@$(CHPL_MAKE_HOME)/util/config/update-if-different $(CONFIGURED_PREFIX_FILE) $(CONFIGURED_PREFIX_FILE).incoming
+	@$(CHPL_MAKE_PYTHON) $(CHPL_MAKE_HOME)/util/config/update-if-different $(CONFIGURED_PREFIX_FILE) $(CONFIGURED_PREFIX_FILE).incoming
 
 $(CLANG_SETTINGS_FILE): FORCE $(COMPILER_BUILD)
 	@echo '{"'$(CLANG_CC)'","'$(CLANG_CXX)'","'`$(CHPL_MAKE_HOME)/util/config/gather-clang-sysroot-arguments $(CLANG_CC)`'"}' | $(FIXPATH_CMD) > $(CLANG_SETTINGS_FILE).incoming
-	@$(CHPL_MAKE_HOME)/util/config/update-if-different $(CLANG_SETTINGS_FILE) $(CLANG_SETTINGS_FILE).incoming
+	@$(CHPL_MAKE_PYTHON) $(CHPL_MAKE_HOME)/util/config/update-if-different $(CLANG_SETTINGS_FILE) $(CLANG_SETTINGS_FILE).incoming
 
 $(CHPL_CONFIG_CHECK): | $(CHPL_BIN_DIR)
 	rm -rf $(CHPL_CONFIG_CHECK_PREFIX)

make/Makefile.base

@@ -34,6 +34,7 @@ MAKEFLAGS = --no-print-directory
 #
 unexport CONFIG_SITE
 
+
 ifndef CHPL_MAKE_HOST_TARGET
 CHPL_MAKE_HOST_TARGET = --host
 endif
@@ -99,6 +100,9 @@ $(eval $(CHPL_MAKE_SETTINGS))
 # Try this to debug issues with CHPL_MAKE_* variables
 # $(info $(CHPL_MAKE_CHPLENV_CACHE))
 
+# Compute python command name
+export CHPL_MAKE_PYTHON := $(shell $(CHPL_MAKE_HOME)/util/config/find-python.sh)
+
 # Now do some minor situational clean-ups.
 
 # The config variable for segment is CHPL_GASNET_SEGMENT

modules/Makefile

@@ -59,11 +59,11 @@ MAKE_SYS_BASIC_TYPES=$(CHPL_MAKE_HOME)/util/config/make_sys_basic_types.py
 
 $(SYS_CTYPES_MODULE): $(MAKE_SYS_BASIC_TYPES)
 	mkdir -p $(@D)
-	cd $(@D) && $(MAKE_SYS_BASIC_TYPES) $(@F)
+	cd $(@D) && $(CHPL_MAKE_PYTHON) $(MAKE_SYS_BASIC_TYPES) $(@F)
 
 $(SYS_CTYPES_MODULE_DOC): $(MAKE_SYS_BASIC_TYPES)
 	mkdir -p $(@D)
-	cd $(@D) && $(MAKE_SYS_BASIC_TYPES) --doc $(@F)
+	cd $(@D) && $(CHPL_MAKE_PYTHON) $(MAKE_SYS_BASIC_TYPES) --doc $(@F)
 
 MODULES_TO_DOCUMENT = \
 	standard/Assert.chpl \

runtime/Makefile

@@ -65,7 +65,7 @@ $(CHPL_ENV_HEADER): $(CHPL_MAKE_HOME)/util/printchplenv $(CHPL_MAKE_HOME)/util/c
           awk '{ print "#define " $$1 "_" toupper($$2) }' >> $(CHPL_ENV_HEADER)
 	@echo "#endif /* _CHPL_ENV_GEN_H_ */" >> $(CHPL_ENV_HEADER)
 
-THIRD_PARTY_PKGS = $(shell $(CHPL_MAKE_HOME)/util/chplenv/third-party-pkgs)
+THIRD_PARTY_PKGS = $(shell $(CHPL_MAKE_PYTHON) $(CHPL_MAKE_HOME)/util/chplenv/third-party-pkgs)
 # NOTE: If any of these builds fail, we won't stop building
 third-party-pkgs:
 ifneq (, $(THIRD_PARTY_PKGS))

runtime/Makefile.config

@@ -41,7 +41,8 @@ ifndef CHPL_MAKE_THIRD_PARTY
 CHPL_MAKE_THIRD_PARTY = $(CHPL_MAKE_HOME)/third-party
 endif
 
-FIXPATH_CMD := $(CHPL_MAKE_HOME)/util/config/replace-paths.py \
+FIXPATH_CMD := $(CHPL_MAKE_PYTHON) \
+                  $(CHPL_MAKE_HOME)/util/config/replace-paths.py \
                   --fixpath '$$CHPL_RUNTIME_LIB' $(CHPL_MAKE_RUNTIME_LIB) \
                   --fixpath '$$CHPL_RUNTIME_INCL' $(CHPL_MAKE_RUNTIME_INCL) \
                   --fixpath '$$CHPL_THIRD_PARTY' $(CHPL_MAKE_THIRD_PARTY) \

third-party/llvm/Makefile

@@ -187,7 +187,7 @@ $(LLVM_CLANG_CONFIG_FILE): FORCE
         else \
           touch $(LLVM_CLANG_CONFIG_FILE).incoming ; \
         fi
-	@$(CHPL_MAKE_HOME)/util/config/update-if-different $(LLVM_CLANG_CONFIG_FILE) $(LLVM_CLANG_CONFIG_FILE).incoming
+	@$(CHPL_MAKE_PYTHON) $(CHPL_MAKE_HOME)/util/config/update-if-different $(LLVM_CLANG_CONFIG_FILE) $(LLVM_CLANG_CONFIG_FILE).incoming
 
 configure-llvm: $(LLVM_CONFIGURED_HEADER_FILE)
 

util/buildRelease/install.sh

@@ -266,6 +266,10 @@ myinstalldir  util/chplenv            "$DEST_CHPL_HOME"/util/chplenv/
 # (needed for LLVM builds)
 myinstallfile util/config/compileline "$DEST_CHPL_HOME"/util/config/
 
+# copy util/config/fixpath.py
+# (needed by setchplenv*)
+myinstallfile util/config/find-python.sh "$DEST_CHPL_HOME"/util/config/
+
 # copy util/config/fixpath.py
 # (needed by setchplenv*)
 myinstallfile util/config/fixpath.py  "$DEST_CHPL_HOME"/util/config/

util/chplenv/chpl_python_version.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 import optparse
 import sys
 

util/config/find-python.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for cmd in python3 python python2; do
+  command -v > /dev/null $cmd && echo $cmd && exit 0
+done

util/config/make_sys_basic_types.py

@@ -12,7 +12,6 @@
 """
 
 from __future__ import print_function
-
 import contextlib
 import logging
 import optparse

util/printchplenv

@@ -6,4 +6,6 @@
 # using a symlink for such a core script makes me nervous for some reason.
 
 CWD=$(cd $(dirname $0) ; pwd)
-"$CWD/chplenv/printchplenv.py" "$@"
+
+PY=`"$CWD/config/find-python.sh"`
+$PY "$CWD/chplenv/printchplenv.py" "$@"

util/quickstart/setchplenv.bash

@@ -23,10 +23,12 @@ if [ ! -d "$chpl_home/util" ] || [ ! -d "$chpl_home/compiler" ] || [ ! -d "$chpl
     return 1
 fi
 
+CHPL_PYTHON=`$chpl_home/util/config/find-python.sh`
+
 # Remove any previously existing CHPL_HOME paths
-MYPATH=`$chpl_home/util/config/fixpath.py "$PATH"`
+MYPATH=`$CHPL_PYTHON $chpl_home/util/config/fixpath.py "$PATH"`
 exitcode=$?
-MYMANPATH=`$chpl_home/util/config/fixpath.py "$MANPATH"`
+MYMANPATH=`$CHPL_PYTHON $chpl_home/util/config/fixpath.py "$MANPATH"`
 
 # Double check $MYPATH before overwriting $PATH
 if [ -z "${MYPATH}" -o "${exitcode}" -ne 0 ]; then
@@ -38,7 +40,7 @@ fi
 export CHPL_HOME=$chpl_home
 echo "Setting CHPL_HOME to $CHPL_HOME"
 
-CHPL_BIN_SUBDIR=`"$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
+CHPL_BIN_SUBDIR=`$CHPL_PYTHON "$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
 
 export PATH="$CHPL_HOME"/bin/$CHPL_BIN_SUBDIR:"$CHPL_HOME"/util:"$MYPATH"
 echo "Updating PATH to include $CHPL_HOME/bin/$CHPL_BIN_SUBDIR"

util/quickstart/setchplenv.csh

@@ -9,10 +9,16 @@ if ( ! -d "util" || ! -d "compiler" || ! -d "runtime" || ! -d "modules" ) then
    exit 1
 endif
 
+echo -n "Setting CHPL_HOME "
+setenv CHPL_HOME "$cwd"
+echo "to $CHPL_HOME"
+
+set CHPL_PYTHON = `"$CHPL_HOME"/util/config/find-python.sh`
+
 # Remove any previously existing CHPL_HOME paths
-set MYPATH = `./util/config/fixpath.py "$PATH"`
+set MYPATH = `$CHPL_PYTHON "$CHPL_HOME"/util/config/fixpath.py "$PATH"`
 set exitcode = $?
-set MYMANPATH = `./util/config/fixpath.py "$MANPATH"`
+set MYMANPATH = `$CHPL_PYTHON "$CHPL_HOME"/util/config/fixpath.py "$MANPATH"`
 
 # Double check $MYPATH before overwriting $PATH
 if ( "$MYPATH" == "" || "$exitcode" != 0) then
@@ -21,11 +27,7 @@ if ( "$MYPATH" == "" || "$exitcode" != 0) then
     exit 1
 endif
 
-echo -n "Setting CHPL_HOME "
-setenv CHPL_HOME "$cwd"
-echo "to $CHPL_HOME"
-
-set CHPL_BIN_SUBDIR = `"$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
+set CHPL_BIN_SUBDIR = `$CHPL_PYTHON "$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
 
 echo -n "Updating PATH "
 setenv PATH "$CHPL_HOME/bin/$CHPL_BIN_SUBDIR":"$CHPL_HOME/util":"$MYPATH"

util/quickstart/setchplenv.fish

@@ -13,10 +13,12 @@ if [ ! -d "$chpl_home/util" -o ! -d "$chpl_home/compiler" -o ! -d "$chpl_home/ru
     exit 1
 end
 
+eval set CHPL_PYTHON (eval "$chpl_home/util/config/find-python.sh")
+
 # Remove any previously existing CHPL_HOME paths
-eval set MYPATH (eval "$chpl_home/util/config/fixpath.py \" $PATH \" \"--shell=fish\"")
+eval set MYPATH (eval "$CHPL_PYTHON" "$chpl_home/util/config/fixpath.py \" $PATH \" \"--shell=fish\"")
 set exitcode $status
-eval set MYMANPATH (eval "$chpl_home/util/config/fixpath.py \" $MANPATH \" \"--shell=fish\"")
+eval set MYMANPATH (eval "$CHPL_PYTHON" "$chpl_home/util/config/fixpath.py \" $MANPATH \" \"--shell=fish\"")
 
 # Double check $MYPATH before overwriting $PATH
 if [ (count $MYPATH) = 0 -o ! $exitcode = 0 ]
@@ -29,7 +31,7 @@ echo -n "Setting CHPL_HOME "
 set -x CHPL_HOME $chpl_home
 echo "to $CHPL_HOME"
 
-set -x CHPL_BIN_SUBDIR (eval "$CHPL_HOME/util/chplenv/chpl_bin_subdir.py")
+set -x CHPL_BIN_SUBDIR (eval "$CHPL_PYTHON" "$CHPL_HOME/util/chplenv/chpl_bin_subdir.py")
 
 echo -n "Updating PATH "
 set -x PATH $CHPL_HOME/bin/$CHPL_BIN_SUBDIR $CHPL_HOME/util $MYPATH

util/quickstart/setchplenv.sh

@@ -10,9 +10,18 @@ if [ ! -d "util" ] || [ ! -d "compiler" ] || [ ! -d "runtime" ] || [ ! -d "modul
     echo "Error: You must use '. util/setchplenv.sh' from within the chapel root directory."
     return 1
 fi
-MYPATH=`./util/config/fixpath.py "$PATH"`
+
+echo "Setting CHPL_HOME..."
+CHPL_HOME=`pwd`
+export CHPL_HOME
+echo "                    ...to $CHPL_HOME"
+echo " "
+
+CHPL_PYTHON=`"$CHPL_HOME"/util/config/find-python.sh`
+
+MYPATH=`$CHPL_PYTHON "$CHPL_HOME"/util/config/fixpath.py "$PATH"`
 exitcode=$?
-MYMANPATH=`./util/config/fixpath.py "$MANPATH"`
+MYMANPATH=`$CHPL_PYTHON "$CHPL_HOME"/util/config/fixpath.py "$MANPATH"`
 
 # Double check $MYPATH before overwriting $PATH
 if [ -z "${MYPATH}" -o "${exitcode}" -ne 0 ]; then
@@ -21,13 +30,7 @@ if [ -z "${MYPATH}" -o "${exitcode}" -ne 0 ]; then
     return 1
 fi
 
-echo "Setting CHPL_HOME..."
-CHPL_HOME=`pwd`
-export CHPL_HOME
-echo "                    ...to $CHPL_HOME"
-echo " "
-
-CHPL_BIN_SUBDIR=`"$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
+CHPL_BIN_SUBDIR=`$CHPL_PYTHON "$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
 
 echo "Updating PATH to include..."
 PATH="$CHPL_HOME"/bin/$CHPL_BIN_SUBDIR:"$CHPL_HOME"/util:"$MYPATH"

util/setchplenv.bash

@@ -23,10 +23,12 @@ if [ ! -d "$chpl_home/util" ] || [ ! -d "$chpl_home/compiler" ] || [ ! -d "$chpl
     return 1
 fi
 
+CHPL_PYTHON=`$chpl_home/util/config/find-python.sh`
+
 # Remove any previously existing CHPL_HOME paths
-MYPATH=`$chpl_home/util/config/fixpath.py "$PATH"`
+MYPATH=`$CHPL_PYTHON $chpl_home/util/config/fixpath.py "$PATH"`
 exitcode=$?
-MYMANPATH=`$chpl_home/util/config/fixpath.py "$MANPATH"`
+MYMANPATH=`$CHPL_PYTHON $chpl_home/util/config/fixpath.py "$MANPATH"`
 
 # Double check $MYPATH before overwriting $PATH
 if [ -z "${MYPATH}" -o "${exitcode}" -ne 0 ]; then
@@ -38,7 +40,7 @@ fi
 export CHPL_HOME=$chpl_home
 echo "Setting CHPL_HOME to $CHPL_HOME"
 
-CHPL_BIN_SUBDIR=`"$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
+CHPL_BIN_SUBDIR=`$CHPL_PYTHON "$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
 
 export PATH="$CHPL_HOME"/bin/$CHPL_BIN_SUBDIR:"$CHPL_HOME"/util:"$MYPATH"
 echo "Updating PATH to include $CHPL_HOME/bin/$CHPL_BIN_SUBDIR"

util/setchplenv.csh

@@ -9,10 +9,16 @@ if ( ! -d "util" || ! -d "compiler" || ! -d "runtime" || ! -d "modules" ) then
    exit 1
 endif
 
+echo -n "Setting CHPL_HOME "
+setenv CHPL_HOME "$cwd"
+echo "to $CHPL_HOME"
+
+set CHPL_PYTHON = `"$CHPL_HOME"/util/config/find-python.sh`
+
 # Remove any previously existing CHPL_HOME paths
-set MYPATH = `./util/config/fixpath.py "$PATH"`
+set MYPATH = `$CHPL_PYTHON "$CHPL_HOME"/util/config/fixpath.py "$PATH"`
 set exitcode = $?
-set MYMANPATH = `./util/config/fixpath.py "$MANPATH"`
+set MYMANPATH = `$CHPL_PYTHON "$CHPL_HOME"/util/config/fixpath.py "$MANPATH"`
 
 # Double check $MYPATH before overwriting $PATH
 if ( "$MYPATH" == "" || "$exitcode" != 0) then
@@ -21,11 +27,7 @@ if ( "$MYPATH" == "" || "$exitcode" != 0) then
     exit 1
 endif
 
-echo -n "Setting CHPL_HOME "
-setenv CHPL_HOME "$cwd"
-echo "to $CHPL_HOME"
-
-set CHPL_BIN_SUBDIR = `"$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
+set CHPL_BIN_SUBDIR = `$CHPL_PYTHON "$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
 
 echo -n "Updating PATH "
 setenv PATH "$CHPL_HOME/bin/$CHPL_BIN_SUBDIR":"$CHPL_HOME/util":"$MYPATH"

util/setchplenv.fish

@@ -13,10 +13,12 @@ if [ ! -d "$chpl_home/util" -o ! -d "$chpl_home/compiler" -o ! -d "$chpl_home/ru
     exit 1
 end
 
+eval set CHPL_PYTHON (eval "$chpl_home/util/config/find-python.sh")
+
 # Remove any previously existing CHPL_HOME paths
-eval set MYPATH (eval "$chpl_home/util/config/fixpath.py \" $PATH \" \"--shell=fish\"")
+eval set MYPATH (eval "$CHPL_PYTHON" "$chpl_home/util/config/fixpath.py \" $PATH \" \"--shell=fish\"")
 set exitcode $status
-eval set MYMANPATH (eval "$chpl_home/util/config/fixpath.py \" $MANPATH \" \"--shell=fish\"")
+eval set MYMANPATH (eval "$CHPL_PYTHON" "$chpl_home/util/config/fixpath.py \" $MANPATH \" \"--shell=fish\"")
 
 # Double check $MYPATH before overwriting $PATH
 if [ (count $MYPATH) = 0 -o ! $exitcode = 0 ]
@@ -29,7 +31,7 @@ echo -n "Setting CHPL_HOME "
 set -x CHPL_HOME $chpl_home
 echo "to $CHPL_HOME"
 
-set -x CHPL_BIN_SUBDIR (eval "$CHPL_HOME/util/chplenv/chpl_bin_subdir.py")
+set -x CHPL_BIN_SUBDIR (eval "$CHPL_PYTHON" "$CHPL_HOME/util/chplenv/chpl_bin_subdir.py")
 
 echo -n "Updating PATH "
 set -x PATH $CHPL_HOME/bin/$CHPL_BIN_SUBDIR $CHPL_HOME/util $MYPATH

util/setchplenv.sh

@@ -10,9 +10,18 @@ if [ ! -d "util" ] || [ ! -d "compiler" ] || [ ! -d "runtime" ] || [ ! -d "modul
     echo "Error: You must use '. util/setchplenv.sh' from within the chapel root directory."
     return 1
 fi
-MYPATH=`./util/config/fixpath.py "$PATH"`
+
+echo "Setting CHPL_HOME..."
+CHPL_HOME=`pwd`
+export CHPL_HOME
+echo "                    ...to $CHPL_HOME"
+echo " "
+
+CHPL_PYTHON=`"$CHPL_HOME"/util/config/find-python.sh`
+
+MYPATH=`$CHPL_PYTHON "$CHPL_HOME"/util/config/fixpath.py "$PATH"`
 exitcode=$?
-MYMANPATH=`./util/config/fixpath.py "$MANPATH"`
+MYMANPATH=`$CHPL_PYTHON "$CHPL_HOME"/util/config/fixpath.py "$MANPATH"`
 
 # Double check $MYPATH before overwriting $PATH
 if [ -z "${MYPATH}" -o "${exitcode}" -ne 0 ]; then
@@ -21,13 +30,7 @@ if [ -z "${MYPATH}" -o "${exitcode}" -ne 0 ]; then
     return 1
 fi
 
-echo "Setting CHPL_HOME..."
-CHPL_HOME=`pwd`
-export CHPL_HOME
-echo "                    ...to $CHPL_HOME"
-echo " "
-
-CHPL_BIN_SUBDIR=`"$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
+CHPL_BIN_SUBDIR=`$CHPL_PYTHON "$CHPL_HOME"/util/chplenv/chpl_bin_subdir.py`
 
 echo "Updating PATH to include..."
 PATH="$CHPL_HOME"/bin/$CHPL_BIN_SUBDIR:"$CHPL_HOME"/util:"$MYPATH"