X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=4a5abcc5869941a221fef24f1f244df4eb52db08;hp=f8c1836b46b696873af0079e22a67b704c9099c8;hb=58d8da3cf9641a8d37d652ecd7aa06cb07895a4e;hpb=70edbc34be395ef9697422c88cb436e1c8e3404b

diff --git a/edksetup.bat b/edksetup.bat
index f8c1836b46..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
 
@@ -150,8 +149,7 @@ echo.
 @REM Java Programs can use it.
 @REM It needs the XMLBEANS libraries in order to compile.
 @REM
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto been_here
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib
+set CLASSPATH=%XMLBEANS_HOME%\lib
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
@@ -159,16 +157,13 @@ set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
 
-:been_here
 call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
 
 @REM
 @REM Now we can make the other Java Programs
 @REM All of the remaining Java Programs require the SurfaceArea library to compile
 @REM
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto been_here2
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
-:been_here2
 
 call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 
@@ -176,13 +171,11 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 @REM We have all of the Java Programs and add-in classes created, so we can start
 @REM using the cpp-tasks to create our tools
 @REM
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto been_here3
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
 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
-:been_here3
 
 call ant -f %WORKSPACE%\Tools\build.xml C_Code
 
@@ -233,8 +226,7 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME%
 echo CYGWIN_HOME:   %CYGWIN_HOME%
 echo PATH:          %PATH%
 echo.
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto been_here4
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib
+set CLASSPATH=%XMLBEANS_HOME%\lib
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
@@ -247,7 +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
-:been_here4
+echo CLASSPATH:     %CLASSPATH%
 goto end
 
 :Usage