BaseTools: Update toolsetup.bat to set PYTHONPATH env to run python source

When python tool exe doesn't exist, toolsetup.bat will set up PYTHONPATH,
and set python tool dos script directory into system PATH.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index a64938db609b123824899e56361a77f24e748766..21f5b76e4b1c641755ff1ea26b62297f79a85246 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -247,39 +247,39 @@ if defined FORCE_REBUILD goto check_build_environment
 if defined REBUILD goto check_build_environment\r
 if not exist "%EDK_TOOLS_PATH%" goto check_build_environment\r
 \r
-IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_build_environment\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
+\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 end\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%\EfiLdrImage.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\EfiRom.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenBootSector.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%\GenFfs.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenFv.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenFw.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenPage.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenSec.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenVtf.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\Split.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%\TianoCompress.exe" goto check_build_environment\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\Trim.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\VfrCompile.exe" goto check_build_environment\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\VolInfo.exe" goto check_build_environment\r
 \r
 goto end\r
 \r
 :check_build_environment\r
-\r
-  if not defined FORCE_REBUILD (\r
-    echo.\r
-    echo Rebuilding of tools is not required.  Binaries of the latest,\r
-    echo tested versions of the tools have been tested and included in the\r
-    echo EDK II repository.\r
-    echo.\r
-    echo If you really want to build the tools, use the ForceRebuild option.\r
-    echo.\r
-    goto end\r
-  )\r
+  if defined BASETOOLS_PYTHON_SOURCE goto VisualStudioAvailable\r
 \r
   if not defined BASE_TOOLS_PATH (\r
      if not exist "Source\C\Makefile" (\r
@@ -289,17 +289,14 @@ goto end
        set BASE_TOOLS_PATH=%CD%\r
      )\r
   )\r
-  set PATH=%BASE_TOOLS_PATH%\Bin\Win32;%PATH%\r
-\r
-  set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python\r
-  set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%\r
 \r
   if not defined PYTHON_HOME (\r
     if defined PYTHONHOME (\r
       set PYTHON_HOME=%PYTHONHOME%\r
     ) else (\r
       echo.\r
-      echo  !!! ERROR !!! PYTHON_HOME is required to build or execute the tools, please set it. !!!\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.\r
       goto end\r
     )\r
@@ -307,36 +304,30 @@ goto end
 \r
   @REM We have Python, now test for FreezePython application\r
   if not defined PYTHON_FREEZER_PATH (\r
-    @REM see if we can find FreezePython.ex\r
-    if exist "%PYTHON_HOME%\Tools\cx_Freeze-3.0.3\FreezePython.exe" (\r
-      set PYTHON_FREEZER_PATH=%PYTHON_HOME%\Tools\cx_Freeze-3.0.3\r
-    ) \r
-    if exist "%PYTHON_HOME%\Tools\cx_Freeze\FreezePython.exe" (\r
-      set PYTHON_FREEZER_PATH=%PYTHON_HOME%\Tools\cx_Freeze\r
-    ) \r
-    if exist "C:\cx_Freeze\FreezePython.exe" (\r
-        set PYTHON_FREEZER_PATH=C:\cx_Freeze\r
-    )\r
-    if exist "C:\cx_Freeze-3.0.3" (\r
-        set PYTHON_FREEZER_PATH=C:\cx_Freeze-3.0.3\r
-    )\r
-    if not defined PYTHON_FREEZER_PATH (\r
-      echo.\r
-      echo !!! WARNING !!! Will not be able to compile Python programs to .exe\r
-      echo Will setup environment to run Python scripts directly.\r
-      echo.\r
-      set "PATH=%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%"\r
-      set "PATH=%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%"\r
-      set "PATH=%BASETOOLS_PYTHON_SOURCE%\build;%PATH%"\r
-      set PATHEXT=%PATHEXT%;.py\r
-    )\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=%PATH%;%BASE_TOOLS_PATH%\BinWrappers\WindowsLike"\r
   )\r
+\r
+  set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python\r
+  set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%\r
   \r
-  echo BASE_TOOLS_PATH     = %BASE_TOOLS_PATH%\r
-  echo     PYTHON_PATH     = %PYTHON_PATH%\r
-  echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%\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
+  )\r
   echo.\r
 \r
+:VisualStudioAvailable\r
+  if not defined FORCE_REBUILD (\r
+    if not defined REBUILD (\r
+      goto end\r
+    )\r
+  )\r
   call "%EDK_TOOLS_PATH%\get_vsvars.bat"\r
   if not defined VCINSTALLDIR (\r
     @echo.\r
@@ -344,8 +335,6 @@ goto end
     @echo.\r
     goto end\r
   )\r
-\r
-:VisualStudioAvailable\r
   if not defined FORCE_REBUILD goto IncrementalBuild\r
 \r
 :CleanAndBuild\r