Fixed CLASSPATH so that it is set to a specific value every time (no add-on to existing.)

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1003 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/edksetup.bat b/edksetup.bat
index f8c1836b46b696873af0079e22a67b704c9099c8..b2cbd83f55c805fb7d632bcb7c5bf71908e06ad1 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -150,8 +150,7 @@ echo.
 @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
@@ -159,16 +158,13 @@ set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
 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
@@ -176,13 +172,11 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 @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\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
@@ -233,8 +227,7 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME%
 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
@@ -247,7 +240,6 @@ set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
 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
 goto end\r
 \r
 :Usage\r