X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2Ftoolsetup.bat;h=0d4028db785f573e9ddf4a3f9b3694d3e4bfac09;hb=472eb3b89682f7af333ec46f84f990f6b8d4f497;hp=51c276060ddb5be71bed57b335ca8cde716ebac8;hpb=0cd84daa676270e541f1e9e96d0660f8d37de4ac;p=mirror_edk2.git

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 51c276060d..0d4028db78 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -1,18 +1,18 @@
 @REM @file
-@REM   This stand-alone program is typically called by the edksetup.bat file, 
+@REM   This stand-alone program is typically called by the edksetup.bat file,
 @REM   however it may be executed directly from the BaseTools project folder
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.
 @REM
-@REM Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 @REM
 @REM This program and the accompanying materials are licensed and made available
-@REM under the terms and conditions of the BSD License which accompanies this 
+@REM under the terms and conditions of the BSD License which accompanies this
 @REM distribution.  The full text of the license may be found at:
 @REM   http://opensource.org/licenses/bsd-license.php
 @REM
 @REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR 
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
 @REM IMPLIED.
 @REM
 
@@ -124,7 +124,7 @@ if /I "%1"=="/?" goto Usage
       echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
       echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
       echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
-      echo. 
+      echo.
     )
   )
   set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -140,7 +140,7 @@ if /I "%1"=="/?" goto Usage
       echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
       echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
       echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
-      echo. 
+      echo.
     )
   )
   set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -182,7 +182,7 @@ if NOT exist %CONF_PATH% (
     )
   )
 )
- 
+
 :CopyConf
 if NOT exist %CONF_PATH% (
   mkdir %CONF_PATH%
@@ -299,30 +299,44 @@ goto end
      )
   )
 
-  if not defined PYTHON_HOME (
-    if defined PYTHONHOME (
-      set PYTHON_HOME=%PYTHONHOME%
-    ) else (
-      echo.
-      echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set. 
-      echo PYTHON_HOME is required to build or execute the python tools.
-      echo.
-      goto end
+set PYTHON3=py -3
+:check_python_version
+  %PYTHON3% --version >NUL 2>&1
+  if %ERRORLEVEL% NEQ 0 (
+    if defined PYTHON_HOME (
+      if EXIST "%PYTHON_HOME%" (
+        set PYTHON3=%PYTHON_HOME%\python.exe
+      )
     )
   )
+  %PYTHON3% --version >NUL 2>&1
+  if %ERRORLEVEL% NEQ 0 (
+     echo.
+     echo !!! ERROR !!!  %PYTHON3% not install.
+     echo.
+     goto end
+   )
+  FOR /F "TOKENS=1,2" %%i IN ('%PYTHON3% --version') DO set VERSION=%%j
+  if /I "%VERSION%" LSS "3.6" (
+     echo.
+     echo !!! ERROR !!!  python version should greater than or equal to version 3.6.
+     echo.
+     goto end
+  )
 
+:check_freezer_path
   @REM We have Python, now test for FreezePython application
   if not defined PYTHON_FREEZER_PATH (
     echo.
     echo !!! WARNING !!! PYTHON_FREEZER_PATH environment variable is not set.
     echo Setup environment to run Python scripts directly.
     echo.
-    set "PATH=%PATH%;%BASE_TOOLS_PATH%\BinWrappers\WindowsLike"
+    set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
   )
 
   set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
   set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
-  
+
   echo                PATH = %PATH%
   echo         PYTHON_HOME = %PYTHON_HOME%
   echo          PYTHONPATH = %PYTHONPATH%
@@ -385,11 +399,11 @@ goto end
   @echo.
   echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]]"
   @echo.
-  @echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path. 
+  @echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path.
   @echo         edk_tools_path    EDK_TOOLS_PATH will be set to this path.
-  @echo         Rebuild           If sources are available perform an Incremental build, only 
+  @echo         Rebuild           If sources are available perform an Incremental build, only
   @echo                           build those updated tools.
-  @echo         ForceRebuild      If sources are available, rebuild all tools regardless of 
+  @echo         ForceRebuild      If sources are available, rebuild all tools regardless of
   @echo                           whether they have been updated or not.
   @echo         Reconfig          Reinstall target.txt, tools_def.txt and build_rule.txt.
   @echo.