X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=adc2b6d2cd093c4aac9f426f90988d0a44cc342f;hp=b2cbd83f55c805fb7d632bcb7c5bf71908e06ad1;hb=3eeb9655a132008b6cc6a4d8764be2c4c70d8437;hpb=f907f57b9cd20ea567d78acaff1e7fec908569e5

diff --git a/edksetup.bat b/edksetup.bat
index b2cbd83f55..adc2b6d2cd 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
+set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin
+echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
 
 :path_ok
 
@@ -89,6 +89,7 @@ echo Resetting the PATH variable to include the Framework_Tools_Path for this WO
 @if "%1"=="/help" goto Usage
 
 @IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild
+@IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild
 @IF NOT EXIST "Tools\Jars\GenBuild.jar" goto NormalBuild
 @IF NOT EXIST "Tools\Jars\SurfaceArea.jar" goto NormalBuild
 @IF NOT EXIST "Tools\Jars\cpptasks.jar" goto NormalBuild
@@ -107,8 +108,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,11 +129,12 @@ 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
 
 :ForceBuild
-call ant -f %WORKSPACE%\Tools\build.xml cleanall
+call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall
 
 :NormalBuild
 @REM
@@ -173,10 +173,12 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 @REM using the cpp-tasks to create our tools
 @REM
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.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
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar
 
 call ant -f %WORKSPACE%\Tools\build.xml C_Code
 
@@ -236,10 +238,13 @@ set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.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
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar
+echo CLASSPATH:     %CLASSPATH%
 goto end
 
 :Usage