From b7509087b09ea8e121aae348892205700a75dfdc Mon Sep 17 00:00:00 2001 From: jwang36 Date: Thu, 11 Oct 2007 08:58:33 +0000 Subject: a) Supported MAKE command in tools_def.txt b) Cleaned several message strings in code c) Solved hang issue when the build.exe is broken by Ctrl+C d) Added more specific information for "-v" option of build.exe e) Added "-v"/"-d"/"-q" option for GenFds.exe in makefile if build.exe is called with one of them. f) Removed the calling to vsvars32.bat and added "--nt32" option in edksetup.bat because the nmake.exe's path has been put in tools_def.txt and build.exe will use that information to call nmake.exe g) Removed the calling to vsvars32.bat in BaseTools/toolsetup.bat git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4091 6f19259b-4bc3-4df7-8a09-765794883524 --- edksetup.bat | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'edksetup.bat') diff --git a/edksetup.bat b/edksetup.bat index 2f7fedef3..37c1b2615 100644 --- a/edksetup.bat +++ b/edksetup.bat @@ -28,8 +28,15 @@ @REM @REM Set the WORKSPACE to the current working directory @REM +pushd . +cd %~dp0 set WORKSPACE=%CD% +@if /I not "%1"=="--nt32" goto check_new_build +shift +goto check_vc + +:check_new_build @if /I "%1"=="NewBuild" goto NewBuild :AntBuild @@ -40,12 +47,13 @@ set WORKSPACE=%CD% :check_vc if defined VCINSTALLDIR goto check_cygwin if defined VS71COMNTOOLS ( - call "%VS71COMNTOOLS%\vsvars32.bat" + call "%VS71COMNTOOLS%\vsvars32.bat" ) else ( echo. echo !!! WARNING !!!! Cannot find Visual Studio !!! echo. ) +goto check_new_build :check_cygwin if defined CYGWIN_HOME goto check_java @@ -282,5 +290,6 @@ if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools @goto end :end +@popd @echo on -- cgit v1.2.3