Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BaseTools: only print the environment once in toolsetup.bat 

Avoid printing %PATH% twice: move the printing of the environment down
to print_python_info.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
This commit is contained in:
Rebecca Cran 2023-04-24 11:20:42 -06:00 committed by mergify[bot]
parent dd246227d6
commit b9bbb4ae93
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
BaseTools/toolsetup.bat
View File

@ -250,24 +250,6 @@ if NOT exist %CONF_PATH%\build_rule.txt (
if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\build_rule.template %CONF_PATH%\build_rule.txt > nul if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\build_rule.template %CONF_PATH%\build_rule.txt > nul
) )
echo PATH = %PATH%
echo.
if defined WORKSPACE (
echo WORKSPACE = %WORKSPACE%
)
if defined PACKAGES_PATH (
echo PACKAGES_PATH = %PACKAGES_PATH%
)
echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH%
if defined BASE_TOOLS_PATH (
echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH%
)
if defined EDK_TOOLS_BIN (
echo EDK_TOOLS_BIN = %EDK_TOOLS_BIN%
)
echo CONF_PATH = %CONF_PATH%
echo.
:skip_reconfig :skip_reconfig
@REM @REM
@ -381,7 +363,22 @@ if %ERRORLEVEL% EQU 0 (
goto print_python_info goto print_python_info
:print_python_info :print_python_info
echo PATH = %PATH% echo PATH = %PATH%
echo.
if defined WORKSPACE (
echo WORKSPACE = %WORKSPACE%
)
if defined PACKAGES_PATH (
echo PACKAGES_PATH = %PACKAGES_PATH%
)
echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH%
if defined BASE_TOOLS_PATH (
echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH%
)
if defined EDK_TOOLS_BIN (
echo EDK_TOOLS_BIN = %EDK_TOOLS_BIN%
)
echo CONF_PATH = %CONF_PATH%
echo PYTHON_COMMAND = %PYTHON_COMMAND% echo PYTHON_COMMAND = %PYTHON_COMMAND%
echo PYTHONPATH = %PYTHONPATH% echo PYTHONPATH = %PYTHONPATH%
echo. echo.