@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
+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
@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
\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
@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
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