X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=adc2b6d2cd093c4aac9f426f90988d0a44cc342f;hp=255abdab69d6f1e5b09c8abf7aebd5c6ca009b0c;hb=535329b5c1782a324f072793abd6dc81e54ad007;hpb=450d3b106f1c89f986336cdcf1ef33ef0f4a46aa

diff --git a/edksetup.bat b/edksetup.bat
index 255abdab69..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,33 +70,77 @@ 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
 
-if "%1"=="skip" goto skipbuild
-
-echo.
-echo WORKSPACE:     %WORKSPACE%
-echo JAVA_HOME:     %JAVA_HOME%
-echo ANT_HOME:      %ANT_HOME%
-echo XMLBEANS_HOME: %XMLBEANS_HOME%
-echo CYGWIN_HOME:   %CYGWIN_HOME%
-echo PATH:          %PATH%
-echo.
+@if "%1"=="-h" goto Usage
+@if "%1"=="-help" goto Usage
+@if "%1"=="--help" goto Usage
+@if "%1"=="/h" goto Usage
+@if "%1"=="/?" goto Usage
+@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
+@IF NOT EXIST "Tools\Jars\frameworktasks.jar" goto NormalBuild
+@IF NOT EXIST "Tools\bin\FrameworkWizard.jar" goto NormalBuild
+@IF NOT EXIST "Tools\bin\CompressDll.dll" goto NormalBuild
+@IF NOT EXIST "Tools\bin\CompressDll.lib" goto NormalBuild
+@IF NOT EXIST "Tools\bin\CreateMtFile.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\EfiCompress.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\EfiRom.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\FlashMap.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\FwImage.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\GenAcpiTable.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\GenCRC32Section.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\GenCapsuleHdr.exe" goto NormalBuild
+@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\GenSection.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\GenTEImage.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\GuidChk.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\MakeDeps.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\ModifyInf.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\PeiRebase_Ia32.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\PeiRebase_Ipf.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\PeiRebase_X64.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\SecApResetVectorFixup.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\SecFixup.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\SetStamp.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\SplitFile.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\StrGather.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\Strip.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\VfrCompile.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\ZeroDebugData.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\antlr.exe" goto NormalBuild
+@IF NOT EXIST "Tools\bin\dlg.exe" goto NormalBuild
+
+@if "%1"=="Rebuild" goto NormalBuild
+@if "%1"=="ForceRebuild" goto ForceBuild
+@if NOT "%1"=="" goto Usage
+
+goto skipbuild
+
+:ForceBuild
+call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall
 
+:NormalBuild
 @REM
 @REM Start to build the Framework Tools
 @REM
 
-
 echo.
 echo Building the Framework Tools
 echo.
@@ -106,22 +150,21 @@ echo.
 @REM Java Programs can use it.
 @REM It needs the XMLBEANS libraries in order to compile.
 @REM
-set CLASSPATH=.;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar
-
-@if "%1" neq "ForceRebuild" goto NormalBuild
-call ant -f %WORKSPACE%\Tools\build.xml cleanall
+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
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
 
-:NormalBuild
 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
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\%Tools\Jars\SurfaceArea.jar
-
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
 
 call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 
@@ -130,8 +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;%WORKSPACE%\Tools\Jars\frameworktasks.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
 
@@ -182,13 +229,29 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME%
 echo CYGWIN_HOME:   %CYGWIN_HOME%
 echo PATH:          %PATH%
 echo.
-set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar
+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
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
+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
+echo.
+echo  Usage: %0 [Rebuild] [ForceRebuild]
+echo.
+
 :end
 @echo on