X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2Ftoolsetup.bat;h=5629bbaa41da03d6a1ab768c0e7a813c3faf7ce2;hb=ffe5f7a6b4e978dffbe1df228963adc914451106;hp=33d50f58ad87df6909ae7dbcc691cd5503e3789e;hpb=f7496d717357b9af78414d19679b073403812340;p=mirror_edk2.git

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 33d50f58ad..5629bbaa41 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -256,39 +256,25 @@ if defined REBUILD goto check_build_environment
 if not exist "%EDK_TOOLS_PATH%" goto check_build_environment
 if not exist "%EDK_TOOLS_BIN%"  goto check_build_environment
 
-IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_c_tools
-IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\EfiRom.exe" goto check_c_tools
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenBootSector.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenFfs.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenFv.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenFw.exe" goto check_c_tools
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenPage.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenSec.exe" goto check_c_tools
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenVtf.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\Split.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\TianoCompress.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\VfrCompile.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\VolInfo.exe" goto check_c_tools
 
-goto check_python_tools
+goto check_build_environment
 
 :check_c_tools
   echo.
-  echo !!! ERROR !!! Binary C tools are missing. They are requried to be built from BaseTools Source.
+  echo !!! ERROR !!! Binary C tools are missing. They are required to be built from BaseTools Source.
   echo.
-  goto check_build_environment
-
-:check_python_tools
-IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenFds.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\TargetTool.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\Trim.exe" goto check_build_environment
-
-goto end
 
 :check_build_environment
-  if defined BASETOOLS_PYTHON_SOURCE goto VisualStudioAvailable
+  set PYTHONHASHSEED=1
 
   if not defined BASE_TOOLS_PATH (
      if not exist "Source\C\Makefile" (
@@ -299,36 +285,93 @@ goto end
      )
   )
 
-  if not defined PYTHON_HOME (
-    if defined PYTHONHOME (
-      set PYTHON_HOME=%PYTHONHOME%
-    ) else (
+:defined_python
+if defined PYTHON_COMMAND if not defined PYTHON3_ENABLE (
+  goto check_python_available
+)
+if defined PYTHON3_ENABLE (
+  if "%PYTHON3_ENABLE%" EQU "TRUE" (
+    set PYTHON_COMMAND=py -3
+    goto check_python_available
+  ) else (
+    goto check_python2
+  )
+)
+if not defined PYTHON_COMMAND if not defined PYTHON3_ENABLE (
+  set PYTHON_COMMAND=py -3
+  py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1
+  setlocal enabledelayedexpansion
+  set /p PythonCheck=<"PythonCheck.txt"
+  del PythonCheck.txt
+  if "!PythonCheck!" NEQ "TRUE" (
+    if not defined PYTHON_HOME if not defined PYTHONHOME (
+      endlocal
+      set PYTHON_COMMAND=
       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 !!! ERROR !!! Binary python tools are missing.
+      echo PYTHON_COMMAND, PYTHON3_ENABLE or PYTHON_HOME
+      echo Environment variable is not set successfully.
+      echo They is required to build or execute the python tools.
       echo.
       goto end
+    ) else (
+      goto check_python2
     )
+  ) else (
+    goto check_freezer_path
   )
+)
 
-  @REM We have Python, now test for FreezePython application
-  if not defined PYTHON_FREEZER_PATH (
+:check_python2
+endlocal
+if defined PYTHON_HOME (
+  if EXIST "%PYTHON_HOME%" (
+    set PYTHON_COMMAND=%PYTHON_HOME%\python.exe
+    goto check_python_available
+  )
+)
+if defined PYTHONHOME (
+  if EXIST "%PYTHONHOME%" (
+    set PYTHON_HOME=%PYTHONHOME%
+    set PYTHON_COMMAND=%PYTHON_HOME%\python.exe
+    goto check_python_available
+  )
+)
+echo.
+echo !!! ERROR !!!  PYTHON_HOME is not defined or The value of this variable does not exist
+echo.
+goto end
+:check_python_available
+%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1
+  setlocal enabledelayedexpansion
+  set /p PythonCheck=<"PythonCheck.txt"
+  del PythonCheck.txt
+  if "!PythonCheck!" NEQ "TRUE" (
     echo.
-    echo !!! WARNING !!! PYTHON_FREEZER_PATH environment variable is not set.
-    echo Setup environment to run Python scripts directly.
+    echo ! ERROR !  "%PYTHON_COMMAND%" is not installed or added to environment variables
     echo.
-    set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
+    goto end
+  ) else (
+    goto check_freezer_path
   )
 
+:check_freezer_path
+  endlocal
+  if defined BASETOOLS_PYTHON_SOURCE goto print_python_info
+  set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
   set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
   set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
 
+:print_python_info
   echo                PATH = %PATH%
-  echo         PYTHON_HOME = %PYTHON_HOME%
-  echo          PYTHONPATH = %PYTHONPATH%
-  if defined PYTHON_FREEZER_PATH (
-    echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%
+  if defined PYTHON3_ENABLE if "%PYTHON3_ENABLE%" EQU "TRUE" (
+    echo      PYTHON3_ENABLE = %PYTHON3_ENABLE%
+    echo             PYTHON3 = %PYTHON_COMMAND%
+  ) else (
+    echo      PYTHON3_ENABLE = FALSE
+    echo      PYTHON_COMMAND = %PYTHON_COMMAND%
   )
+  echo          PYTHONPATH = %PYTHONPATH%
   echo.
 
 :VisualStudioAvailable
@@ -360,18 +403,6 @@ goto end
   cd %BASE_TOOLS_PATH%
   call nmake c
   popd
-
-  if defined PYTHON_FREEZER_PATH (
-    echo BUILDING PYTHON TOOLS
-    pushd .
-    cd %BASE_TOOLS_PATH%
-    call nmake python
-    popd
-  ) else (
-    echo.
-    echo !!! WARNING !!! Cannot make executable from Python code, executing python scripts instead !!!
-    echo.
-  )
   goto end