X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=3e2da9a5e816d7d28a4d350685f01eb042354f30;hp=60c55c4e4f5aded739411beaad3639722062abcc;hb=65a1d8a9023ecf0c9a74700d0a439bec36647c7e;hpb=6de5f959d627648b33a2a7275c35bb9fd6856a26

diff --git a/edksetup.bat b/edksetup.bat
index 60c55c4e4f..3e2da9a5e8 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -106,10 +106,14 @@ 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=.;%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
+
+:NormalBuild
 call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
 
 @REM
@@ -118,14 +122,17 @@ call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
 @REM
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\%Tools\Jars\SurfaceArea.jar
 
+
 call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 
 @REM
 @REM We have all of the Java Programs and add-in classes created, so we can start
 @REM using the cpp-tasks to create our tools
 @REM
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.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
 
 call ant -f %WORKSPACE%\Tools\build.xml C_Code
 
@@ -179,7 +186,8 @@ 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\SurfaceArea.jar
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar
 goto end