sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Remove the step to freeze python tool

Browse Source 
https://bugzilla.tianocore.org/show_bug.cgi?id=1257
Binary python tool is not supported anymore. So, the freeze python tool
step is not required.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Liming Gao
2018-10-16 23:08:46 +08:00
parent 1c3399d73d
commit 7b500c606a
7 changed files with 4 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
BaseTools/toolsetup.bat
View File

@@ -271,21 +271,12 @@ 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.
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
@@ -311,24 +302,13 @@ goto end
)
)
@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=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
)
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%
if defined PYTHON_FREEZER_PATH (
echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%
)
echo.
:VisualStudioAvailable
@@ -360,18 +340,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