-@if /I "%1"=="NewBuild" shift\r
-@if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\r
-@IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools\r
-@call %EDK_TOOLS_PATH%\toolsetup.bat %*\r
-@if /I "%1"=="Reconfig" shift\r
-@goto check_cygwin\r
+\r
+if /I "%1"=="NewBuild" shift\r
+if not defined EDK_TOOLS_PATH (\r
+ if exist %WORKSPACE%\BaseTools (\r
+ set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\r
+ ) else (\r
+ if defined PACKAGES_PATH (\r
+ for %%i IN (%PACKAGES_PATH%) DO (\r
+ if exist %%~fi\BaseTools (\r
+ set EDK_TOOLS_PATH=%%~fi\BaseTools\r
+ goto checkBaseTools\r
+ )\r
+ )\r
+ ) else (\r
+ echo.\r
+ echo !!! ERROR !!! Cannot find BaseTools !!!\r
+ echo. \r
+ goto BadBaseTools\r
+ )\r
+ )\r
+)\r
+if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%\r
+\r
+:checkBaseTools\r
+IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools\r
+call %EDK_TOOLS_PATH%\toolsetup.bat %*\r
+if /I "%1"=="Reconfig" shift\r
+goto check_NASM\r
+goto check_cygwin\r