@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
: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
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
+echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE\r
\r
:path_ok\r
\r
@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
@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
\r
@if "%1"=="Rebuild" goto NormalBuild\r
@if "%1"=="ForceRebuild" goto ForceBuild\r
+@if NOT "%1"=="" goto Usage\r
\r
goto skipbuild\r
\r
@REM Java Programs can use it.\r
@REM It needs the XMLBEANS libraries in order to compile.\r
@REM\r
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto been_here\r
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\r
+set CLASSPATH=%XMLBEANS_HOME%\lib\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar\r
\r
-:been_here\r
call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea\r
\r
@REM\r
@REM Now we can make the other Java Programs\r
@REM All of the remaining Java Programs require the SurfaceArea library to compile\r
@REM\r
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto been_here2\r
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar\r
-:been_here2\r
\r
call ant -f %WORKSPACE%\Tools\build.xml JavaCode\r
\r
@REM We have all of the Java Programs and add-in classes created, so we can start\r
@REM using the cpp-tasks to create our tools\r
@REM\r
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto been_here3\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
-:been_here3\r
\r
call ant -f %WORKSPACE%\Tools\build.xml C_Code\r
\r
echo CYGWIN_HOME: %CYGWIN_HOME%\r
echo PATH: %PATH%\r
echo.\r
-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto been_here4\r
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\r
+set CLASSPATH=%XMLBEANS_HOME%\lib\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar\r
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar\r
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
-:been_here4\r
+echo CLASSPATH: %CLASSPATH%\r
goto end\r
\r
:Usage\r