From 402bbc765bfc6bae2758d2c6853184ed3850a5df Mon Sep 17 00:00:00 2001 From: jwang36 Date: Wed, 31 Oct 2007 09:12:54 +0000 Subject: [PATCH] Added VS2005 support git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4247 6f19259b-4bc3-4df7-8a09-765794883524 --- edksetup.bat | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/edksetup.bat b/edksetup.bat index 8f3e1ec94f..91b83c637d 100644 --- a/edksetup.bat +++ b/edksetup.bat @@ -39,8 +39,20 @@ set WORKSPACE=%CD% @if /I "%1"=="/?" goto Usage @if /I "%1"=="/help" goto Usage @if /I not "%1"=="--nt32" goto check_new_build +if not defined VCINSTALLDIR ( + if defined VS71COMNTOOLS ( + call "%VS71COMNTOOLS%\vsvars32.bat" + ) else ( + if defined VS80COMNTOOLS ( + call "%VS80COMNTOOLS%\vsvars32.bat" + ) else ( + echo. + echo !!! WARNING !!! Cannot find Visual Studio !!! + echo. + ) + ) +) shift -goto check_vc :check_new_build @if /I "%1"=="NewBuild" goto NewBuild @@ -51,30 +63,22 @@ goto check_vc @REM :check_vc -@REM The following setup is required for building the Nt32Pkg\Nt32.dsc -@REM platform emulation environment. if defined VCINSTALLDIR goto check_cygwin if defined VS71COMNTOOLS ( - @REM Use Visual Studio .NET 2003 if it is installed - call "%VS71COMNTOOLS%\vsvars32.bat" -) else if defined VS80COMNTOOLS ( - @REM Use Visual Studio 2005 iff Visual Studio .NET 2003 is not installed. - call "%VS80COMNTOOLS%\vsvars32.bat" + call "%VS71COMNTOOLS%\vsvars32.bat" ) else ( echo. - echo !!! WARNING !!!! Cannot find Visual Studio !!! + echo !!! WARNING !!! Cannot find Visual Studio !!! echo. ) -goto check_new_build :check_cygwin -@if /I "%1"=="NewBuild" goto NewBuild if defined CYGWIN_HOME goto check_java if exist c:\cygwin ( set CYGWIN_HOME=c:\cygwin ) else ( echo. - echo !!! WARNING !!!! Not set CYGWIN_HOME, gcc build may not be used !!! + echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!! echo. ) @@ -280,12 +284,12 @@ goto end :Usage echo. -echo Usage: %0 [--nt32] [NewBuild] [Rebuild] [ForceRebuild] [Reconfig] +echo Usage: "%0 [--nt32] [NewBuild | Rebuild | ForceRebuild | Reconfig]" echo --nt32 Call vsvars32.bat for NT32 platform build echo NewBuild Using new build tools in BaseTools package -echo Rebuild: Incremental build, only build those updated tools; -echo ForceRebuild: Rebuild all tools neither updated or not; -echo Reconfig: Reinstall target.txt, tools_def.txt, FrameworkDatabase.db. +echo Rebuild Incremental build, only build those updated tools (Ant build only) +echo ForceRebuild Rebuild all tools neither updated or not (Ant build only) +echo Reconfig Reinstall target.txt, tools_def.txt, FrameworkDatabase.db (Ant build only) echo. echo Note that target.template, tools_def.template, FrameworkDatabase.template will be echo only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectively if they -- 2.39.2