X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.sh;h=06d2f041e635d88369ecbb5801b4a2d4c098dd25;hp=d4e577e607811fa90f712c8e691a70c6218f13ee;hb=6ff7c838d09224dd4e4c9b5b93152d8db1b19740;hpb=04c47cd40111f85614ec51f6ba8d4e9a2f0fafde

diff --git a/edksetup.sh b/edksetup.sh
index d4e577e607..06d2f041e6 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -1,13 +1,7 @@
 #
 # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.  The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# 
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 # In *inux environment, the build tools's source is required and need to be compiled
 # firstly, please reference https://github.com/tianocore/tianocore.github.io/wiki/SourceForge-to-Github-Quick-Start
@@ -49,16 +43,17 @@ function SetWorkspace()
   #
   # If WORKSPACE is already set, then we can return right now
   #
+  export PYTHONHASHSEED=1
   if [ -n "$WORKSPACE" ]
   then
     return 0
   fi
 
-  if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] && [ -z "$PACKAGES_PATH" ]
+  if [ ! ${BASH_SOURCE[0]} -ef ./$SCRIPTNAME ] && [ -z "$PACKAGES_PATH" ]
   then
     echo Run this script from the base of your tree.  For example:
     echo "  cd /Path/To/Edk/Root"
-    echo "  . edksetup.sh"
+    echo "  . $SCRIPTNAME"
     return 1
   fi
 
@@ -76,8 +71,7 @@ function SetWorkspace()
   #
   # Set $WORKSPACE
   #
-  export WORKSPACE=`pwd`
-
+  export WORKSPACE=$PWD
   return 0
 }
 
@@ -90,7 +84,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
@@ -113,39 +107,79 @@ function SetupEnv()
 
 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}" ];then
+    if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then
       continue
     fi
     if [ -z $origin_version ];then
       origin_version=$python_version
-      export PYTHON3=$python
+      export PYTHON_COMMAND=$python
       continue
     fi
-    ret=`echo "$origin_version < $python_version" |bc`
-    if [ "$ret" -eq 1 ]; then
+      if [[ "$origin_version" < "$python_version" ]]; then
       origin_version=$python_version
-      export PYTHON3=$python
+      export PYTHON_COMMAND=$python
     fi
   done
-  if [ -z "$origin_version" ] || [ `echo "$origin_version < 3.6" |bc` -eq 1 ]; then
-    echo
-    echo ERROR!!!, python version should greater than or equal to version 3.6.
-    echo 
-    return 1
+  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
+      if [[ "$origin_version" < "$python_version" ]]; then
+        origin_version=$python_version
+        export PYTHON_COMMAND=$python
+      fi
+    done
+    return 0
+  fi
+
+  SetupPython3
 }
 
 function SourceEnv()
 {
   SetWorkspace &&
   SetupEnv
-  SetupPython3
+  SetupPython
 }
 
 I=$#
@@ -160,12 +194,12 @@ do
       RECONFIG=TRUE
       shift
     ;;
-    -?|-h|--help|*)
+    *)
       HelpMsg
       break
     ;;
   esac
-  I=$(($I - 1))
+  I=$((I - 1))
 done
 
 if [ $I -gt 0 ]