BaseTools: Update windows and linux run scripts file to use Python3

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 33d50f58ad87df6909ae7dbcc691cd5503e3789e..811b23051fd9a55280d9f54cd13df39c6deca76e 100755 (executable)
--- 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\r
 if not exist "%EDK_TOOLS_BIN%"  goto check_build_environment\r
 \r
-IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_c_tools\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\EfiRom.exe" goto check_c_tools\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenBootSector.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenFfs.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenFv.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenFw.exe" goto check_c_tools\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenPage.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenSec.exe" goto check_c_tools\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenVtf.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\Split.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\TianoCompress.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\VfrCompile.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\VolInfo.exe" goto check_c_tools\r
 \r
-goto check_python_tools\r
+goto check_build_environment\r
 \r
 :check_c_tools\r
   echo.\r
   echo !!! ERROR !!! Binary C tools are missing. They are requried to be built from BaseTools Source.\r
   echo.\r
-  goto check_build_environment\r
-\r
-:check_python_tools\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenFds.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\TargetTool.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\Trim.exe" goto check_build_environment\r
-\r
-goto end\r
 \r
 :check_build_environment\r
-  if defined BASETOOLS_PYTHON_SOURCE goto VisualStudioAvailable\r
+  set PYTHONHASHSEED=1\r
 \r
   if not defined BASE_TOOLS_PATH (\r
      if not exist "Source\C\Makefile" (\r
@@ -299,36 +285,61 @@ goto end
      )\r
   )\r
 \r
-  if not defined PYTHON_HOME (\r
-    if defined PYTHONHOME (\r
-      set PYTHON_HOME=%PYTHONHOME%\r
-    ) else (\r
+:defined_python\r
+if defined PYTHON3_ENABLE (\r
+  if "%PYTHON3_ENABLE%" EQU "TRUE" (\r
+    set PYTHON=py -3\r
+    %PYTHON% --version >NUL 2>&1\r
+    if %ERRORLEVEL% NEQ 0 (\r
       echo.\r
-      echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set.\r
-      echo PYTHON_HOME is required to build or execute the python tools.\r
+      echo !!! ERROR !!!  PYTHON3 is not installed or added to environment variables\r
       echo.\r
       goto end\r
+    ) else (\r
+      goto check_freezer_path\r
     )\r
-  )\r
+  ) \r
+)\r
 \r
-  @REM We have Python, now test for FreezePython application\r
-  if not defined PYTHON_FREEZER_PATH (\r
-    echo.\r
-    echo !!! WARNING !!! PYTHON_FREEZER_PATH environment variable is not set.\r
-    echo Setup environment to run Python scripts directly.\r
-    echo.\r
-    set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"\r
+if defined PYTHON_HOME (\r
+  if EXIST "%PYTHON_HOME%" (\r
+    set PYTHON=%PYTHON_HOME%\python.exe\r
+    goto check_freezer_path\r
+    )\r
   )\r
+if defined PYTHONHOME (\r
+  if EXIST "%PYTHONHOME%" (\r
+    set PYTHON_HOME=%PYTHONHOME%\r
+    set PYTHON=%PYTHON_HOME%\python.exe\r
+    goto check_freezer_path\r
+    )\r
+  )\r
+  \r
+  echo.\r
+  echo !!! ERROR !!! Binary python tools are missing.\r
+  echo PYTHON_HOME or PYTHON3_ENABLE environment variable is not set successfully.\r
+  echo PYTHON_HOME or PYTHON3_ENABLE is required to build or execute the python tools.\r
+  echo.\r
+  goto end\r
 \r
+:check_freezer_path\r
+  if defined BASETOOLS_PYTHON_SOURCE goto print_python_info\r
+  set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"\r
   set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python\r
   set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%\r
 \r
+:print_python_info\r
   echo                PATH = %PATH%\r
-  echo         PYTHON_HOME = %PYTHON_HOME%\r
-  echo          PYTHONPATH = %PYTHONPATH%\r
-  if defined PYTHON_FREEZER_PATH (\r
-    echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%\r
+  if "%PYTHON3_ENABLE%" EQU "TRUE" (\r
+    echo      PYTHON3_ENABLE = %PYTHON3_ENABLE%\r
+    echo             PYTHON3 = %PYTHON%\r
+  ) else (\r
+    echo      PYTHON3_ENABLE = %PYTHON3_ENABLE%\r
+    if defined PYTHON_HOME (\r
+      echo         PYTHON_HOME = %PYTHON_HOME%\r
+    )\r
   )\r
+  echo          PYTHONPATH = %PYTHONPATH%\r
   echo.\r
 \r
 :VisualStudioAvailable\r
@@ -360,18 +371,6 @@ goto end
   cd %BASE_TOOLS_PATH%\r
   call nmake c\r
   popd\r
-\r
-  if defined PYTHON_FREEZER_PATH (\r
-    echo BUILDING PYTHON TOOLS\r
-    pushd .\r
-    cd %BASE_TOOLS_PATH%\r
-    call nmake python\r
-    popd\r
-  ) else (\r
-    echo.\r
-    echo !!! WARNING !!! Cannot make executable from Python code, executing python scripts instead !!!\r
-    echo.\r
-  )\r
   goto end\r
 \r
 \r