X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.sh;h=39f62a29bda4c766fc22b3220553f7bdb63e91a7;hp=93d652575804d49f9922862f51c862ad98552091;hb=2fe5f2f52918b63023f0dcb80eb291f67d5e5912;hpb=1ccc4d895dd8d659d016efcd6ef8a48749aba1d0 diff --git a/edksetup.sh b/edksetup.sh index 93d6525758..39f62a29bd 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -49,6 +49,7 @@ function SetWorkspace() # # If WORKSPACE is already set, then we can return right now # + export PYTHONHASHSEED=1 if [ -n "$WORKSPACE" ] then return 0 @@ -77,7 +78,6 @@ function SetWorkspace() # Set $WORKSPACE # export WORKSPACE=`pwd` - return 0 } @@ -90,7 +90,7 @@ function SetupEnv() then . $WORKSPACE/BaseTools/BuildEnv elif [ -n "$PACKAGES_PATH" ] - then + then PATH_LIST=$PACKAGES_PATH PATH_LIST=${PATH_LIST//:/ } for DIR in $PATH_LIST @@ -111,10 +111,83 @@ function SetupEnv() fi } +function SetupPython3() +{ + if [ $origin_version ];then + origin_version= + fi + for python in $(whereis python3) + do + python=$(echo $python | grep "[[:digit:]]$" || true) + python_version=${python##*python} + if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then + continue + fi + if [ -z $origin_version ];then + origin_version=$python_version + export PYTHON_COMMAND=$python + continue + fi + ret=`echo "$origin_version < $python_version" |bc` + if [ "$ret" -eq 1 ]; then + origin_version=$python_version + export PYTHON_COMMAND=$python + fi + done + return 0 +} + +function SetupPython() +{ + if [ $PYTHON_COMMAND ] && [ -z $PYTHON3_ENABLE ];then + if ( command -v $PYTHON_COMMAND >/dev/null 2>&1 );then + return 0 + else + echo $PYTHON_COMMAND Cannot be used to build or execute the python tools. + return 1 + fi + fi + + if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE == TRUE ] + then + SetupPython3 + fi + + if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE != TRUE ] + then + if [ $origin_version ];then + origin_version= + fi + for python in $(whereis python2) + do + python=$(echo $python | grep "[[:digit:]]$" || true) + python_version=${python##*python} + if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then + continue + fi + if [ -z $origin_version ] + then + origin_version=$python_version + export PYTHON_COMMAND=$python + continue + fi + ret=`echo "$origin_version < $python_version" |bc` + if [ "$ret" -eq 1 ]; then + origin_version=$python_version + export PYTHON_COMMAND=$python + fi + done + return 0 + fi + + SetupPython3 +} + function SourceEnv() { SetWorkspace && SetupEnv + SetupPython } I=$#