1) Simplify implementation by reading the entire input file into memory, modifying...

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index b2cbd83f55c805fb7d632bcb7c5bf71908e06ad1..740b7bd15b6badc0a7fe1f78c7d23910d8f152ce 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -15,7 +15,7 @@
 @REM set XMLBEANS_HOME=C:\xmlbeans\r
 @REM set CYGWIN_HOME=C:\cygwin\r
 \r
-@REM usage: edksetup.bat [skip]\r
+@REM usage: edksetup.bat [Rebuild] [ForceRebuild]\r
 @REM if the argument, skip is present, only the paths and the\r
 @REM test and set of environment settings are performed. \r
 \r
@@ -32,7 +32,7 @@
 :check_vc\r
 if defined VCINSTALLDIR goto check_cygwin\r
 if defined VS71COMNTOOLS (\r
-  call "%VS71COMNTOOLS%vsvars32.bat"\r
+  call "%VS71COMNTOOLS%\vsvars32.bat"\r
 ) else (\r
   echo.\r
   echo !!! WARNING !!!! Cannot find Visual Studio !!!\r
@@ -70,14 +70,14 @@ set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
 if defined WORKSPACE_TOOLS_PATH goto check_path\r
 set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%\r
 set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%\r
-echo Setting the PATH variable to include the Framework_Tools_Path for this WORKSPACE\r
+echo Setting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE\r
 goto path_ok\r
 \r
 :check_path\r
 if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok\r
 set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%\r
-set WORKSPACE_PATH=%WORKSPACE%\r
-echo Resetting the PATH variable to include the Framework_Tools_Path for this WORKSPACE\r
+set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin\r
+echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE\r
 \r
 :path_ok\r
 \r
@@ -89,6 +89,7 @@ echo Resetting the PATH variable to include the Framework_Tools_Path for this WO
 @if "%1"=="/help" goto Usage\r
 \r
 @IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild\r
+@IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild\r
 @IF NOT EXIST "Tools\Jars\GenBuild.jar" goto NormalBuild\r
 @IF NOT EXIST "Tools\Jars\SurfaceArea.jar" goto NormalBuild\r
 @IF NOT EXIST "Tools\Jars\cpptasks.jar" goto NormalBuild\r
@@ -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\r
 @IF NOT EXIST "Tools\bin\GenFfsFile.exe" goto NormalBuild\r
 @IF NOT EXIST "Tools\bin\GenFvImage.exe" goto NormalBuild\r
-@IF NOT EXIST "Tools\bin\GenFvImage_IA32.exe" goto NormalBuild\r
-@IF NOT EXIST "Tools\bin\GenFvImage_IPF.exe" goto NormalBuild\r
 @IF NOT EXIST "Tools\bin\GenSection.exe" goto NormalBuild\r
 @IF NOT EXIST "Tools\bin\GenTEImage.exe" goto NormalBuild\r
 @IF NOT EXIST "Tools\bin\GuidChk.exe" goto NormalBuild\r
@@ -130,11 +129,13 @@ echo Resetting the PATH variable to include the Framework_Tools_Path for this WO
 \r
 @if "%1"=="Rebuild" goto NormalBuild\r
 @if "%1"=="ForceRebuild" goto ForceBuild\r
+@if NOT "%1"=="" goto Usage\r
 \r
 goto skipbuild\r
 \r
-:ForceBuild\r
-call ant -f %WORKSPACE%\Tools\build.xml cleanall\r
+:ForceBuild \r
+@if "%CLASSPATH%"=="" set CLASSPATH=  \r
+call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall\r
 \r
 :NormalBuild\r
 @REM\r
@@ -173,10 +174,12 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 @REM using the cpp-tasks to create our tools\r
 @REM\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar\r
 \r
 call ant -f %WORKSPACE%\Tools\build.xml C_Code\r
 \r
@@ -236,10 +239,13 @@ set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar\r
+echo CLASSPATH:     %CLASSPATH%\r
 goto end\r
 \r
 :Usage\r