@REM however it may be executed directly from the BaseTools project folder\r
@REM if the file is not executed within a WORKSPACE\BaseTools folder.\r
@REM\r
-@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
@REM\r
@REM This program and the accompanying materials are licensed and made available\r
@REM under the terms and conditions of the BSD License which accompanies this \r
:loop\r
if "%1"=="" goto setup_workspace\r
if /I "%1"=="--nt32" (\r
+ if /I "%2" == "X64" (\r
+ shift\r
+ )\r
@REM Ignore --nt32 flag\r
shift\r
goto loop\r
if exist %EDK_TOOLS_PATH%\Bin\Win32 (\r
set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32\r
) else (\r
+ set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"\r
echo.\r
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!\r
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32\r
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.\r
echo. \r
- goto end\r
+ goto check_build_environment\r
)\r
)\r
set PATH=%EDK_TOOLS_BIN%;%PATH%\r
if exist %EDK_TOOLS_PATH%\Bin\Win32 (\r
set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32\r
) else (\r
+ set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"\r
echo.\r
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!\r
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32\r
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.\r
echo. \r
- goto end\r
+ goto check_build_environment\r
)\r
)\r
set PATH=%EDK_TOOLS_BIN%;%PATH%\r
goto skip_reconfig\r
)\r
\r
+IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" (\r
+ @echo.\r
+ @echo !!! ERROR !!! The set_vsprefix_envs.bat was not found !!!\r
+ @echo.\r
+ goto end\r
+)\r
+call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat\r
+\r
if not defined CONF_PATH (\r
set CONF_PATH=%WORKSPACE%\Conf\r
)\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
+ goto check_build_environment\r
\r
:check_python_tools\r
IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment\r
set PYTHON_HOME=%PYTHONHOME%\r
) else (\r
echo.\r
- echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set. \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