Added a test for NewBuild argument if this is the second time through the setup - VCINSTALLDIR is set, and cygwin is installed.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4218 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
10
edksetup.bat
10
edksetup.bat
@@ -55,11 +55,11 @@ goto check_vc
|
|||||||
@REM platform emulation environment.
|
@REM platform emulation environment.
|
||||||
if defined VCINSTALLDIR goto check_cygwin
|
if defined VCINSTALLDIR goto check_cygwin
|
||||||
if defined VS71COMNTOOLS (
|
if defined VS71COMNTOOLS (
|
||||||
@REM Use Visual Studio .NET 2003 if it is installed
|
@REM Use Visual Studio .NET 2003 if it is installed
|
||||||
call "%VS71COMNTOOLS%\vsvars32.bat"
|
call "%VS71COMNTOOLS%\vsvars32.bat"
|
||||||
) else if defined VS80COMNTOOLS (
|
) else if defined VS80COMNTOOLS (
|
||||||
@REM Use Visual Studio 2005 iff Visual Studio .NET 2003 is not installed.
|
@REM Use Visual Studio 2005 iff Visual Studio .NET 2003 is not installed.
|
||||||
call "%VS80COMNTOOLS%\vsvars32.bat"
|
call "%VS80COMNTOOLS%\vsvars32.bat"
|
||||||
) else (
|
) else (
|
||||||
echo.
|
echo.
|
||||||
echo !!! WARNING !!!! Cannot find Visual Studio !!!
|
echo !!! WARNING !!!! Cannot find Visual Studio !!!
|
||||||
@@ -68,6 +68,7 @@ if defined VS71COMNTOOLS (
|
|||||||
goto check_new_build
|
goto check_new_build
|
||||||
|
|
||||||
:check_cygwin
|
:check_cygwin
|
||||||
|
@if /I "%1"=="NewBuild" goto NewBuild
|
||||||
if defined CYGWIN_HOME goto check_java
|
if defined CYGWIN_HOME goto check_java
|
||||||
if exist c:\cygwin (
|
if exist c:\cygwin (
|
||||||
set CYGWIN_HOME=c:\cygwin
|
set CYGWIN_HOME=c:\cygwin
|
||||||
@@ -293,6 +294,7 @@ echo.
|
|||||||
@goto end
|
@goto end
|
||||||
|
|
||||||
:NewBuild
|
:NewBuild
|
||||||
|
echo in NewBuild
|
||||||
@IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild
|
@IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild
|
||||||
if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
|
if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
|
||||||
@call BaseTools\toolsetup.bat
|
@call BaseTools\toolsetup.bat
|
||||||
|
Reference in New Issue
Block a user