X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=4a5abcc5869941a221fef24f1f244df4eb52db08;hp=b2cbd83f55c805fb7d632bcb7c5bf71908e06ad1;hb=5b1ed65f2f94547ffe528d0775345ef06fa5ce41;hpb=f907f57b9cd20ea567d78acaff1e7fec908569e5

diff --git a/edksetup.bat b/edksetup.bat
index b2cbd83f55..4a5abcc586 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -15,7 +15,7 @@
 @REM set XMLBEANS_HOME=C:\xmlbeans
 @REM set CYGWIN_HOME=C:\cygwin
 
-@REM usage: edksetup.bat [skip]
+@REM usage: edksetup.bat [Rebuild] [ForceRebuild]
 @REM if the argument, skip is present, only the paths and the
 @REM test and set of environment settings are performed. 
 
@@ -32,7 +32,7 @@
 :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 !!!
@@ -70,14 +70,14 @@ set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
 if defined WORKSPACE_TOOLS_PATH goto check_path
 set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%
 set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%
-echo Setting the PATH variable to include the Framework_Tools_Path for this WORKSPACE
+echo Setting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
 goto path_ok
 
 :check_path
 if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok
 set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%
 set WORKSPACE_PATH=%WORKSPACE%
-echo Resetting the PATH variable to include the Framework_Tools_Path for this WORKSPACE
+echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
 
 :path_ok
 
@@ -107,8 +107,6 @@ echo Resetting the PATH variable to include the Framework_Tools_Path for this WO
 @IF NOT EXIST "Tools\bin\GenDepex.exe" goto NormalBuild
 @IF NOT EXIST "Tools\bin\GenFfsFile.exe" goto NormalBuild
 @IF NOT EXIST "Tools\bin\GenFvImage.exe" goto NormalBuild
-@IF NOT EXIST "Tools\bin\GenFvImage_IA32.exe" goto NormalBuild
-@IF NOT EXIST "Tools\bin\GenFvImage_IPF.exe" goto NormalBuild
 @IF NOT EXIST "Tools\bin\GenSection.exe" goto NormalBuild
 @IF NOT EXIST "Tools\bin\GenTEImage.exe" goto NormalBuild
 @IF NOT EXIST "Tools\bin\GuidChk.exe" goto NormalBuild
@@ -130,6 +128,7 @@ echo Resetting the PATH variable to include the Framework_Tools_Path for this WO
 
 @if "%1"=="Rebuild" goto NormalBuild
 @if "%1"=="ForceRebuild" goto ForceBuild
+@if NOT "%1"=="" goto Usage
 
 goto skipbuild
 
@@ -240,6 +239,7 @@ set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar
+echo CLASSPATH:     %CLASSPATH%
 goto end
 
 :Usage