X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=722df882deb79fe4a309c8dd5004e31306833782;hp=03fe4e671341d9c3602ceccd12ee045a6dce21c2;hb=7a6de051139499edd80ddccafcfcba4f34515d35;hpb=302e0e4a1f98cb3b79647c38baef456311bd4798

diff --git a/edksetup.bat b/edksetup.bat
index 03fe4e6713..722df882de 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -29,8 +29,6 @@
 @REM Check the required system environment variables
 @REM
 
-if "%1"=="skip" goto skipbuild
-
 :check_vc
 if defined VCINSTALLDIR goto check_cygwin
 if defined VS71COMNTOOLS (
@@ -68,14 +66,29 @@ if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8
 set WORKSPACE=%CD%
 
 set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%Framework_Tools_Path%;%PATH%
+
+if defined WORKSPACE_TOOLS_PATH goto check_path
+set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%
+set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%
+echo Setting the PATH variable to include the Framework_Tools_Path for this WORKSPACE
+goto path_ok
+
+:check_path
+if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok
+set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%
+set WORKSPACE_PATH=%WORKSPACE%
+echo Resetting the PATH variable to include the Framework_Tools_Path for this WORKSPACE
+
+:path_ok
+
+if "%1"=="skip" goto skipbuild
 
 echo.
+echo WORKSPACE:     %WORKSPACE%
 echo JAVA_HOME:     %JAVA_HOME%
 echo ANT_HOME:      %ANT_HOME%
 echo XMLBEANS_HOME: %XMLBEANS_HOME%
 echo CYGWIN_HOME:   %CYGWIN_HOME%
-echo WORKSPACE:     %WORKSPACE%
 echo PATH:          %PATH%
 echo.
 
@@ -93,7 +106,7 @@ 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
 
@@ -105,12 +118,14 @@ 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
 
@@ -155,15 +170,12 @@ goto end
 @REM
 @REM This just sets up the CLASSPATH, the rest of the environment should have been set already.
 @REM
-set WORKSPACE=%CD%
-set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
-if exist c:\cygwin set CYGWIN_HOME=c:\cygwin
 echo.
+echo WORKSPACE:     %WORKSPACE%
 echo JAVA_HOME:     %JAVA_HOME%
 echo ANT_HOME:      %ANT_HOME%
 echo XMLBEANS_HOME: %XMLBEANS_HOME%
 echo CYGWIN_HOME:   %CYGWIN_HOME%
-echo WORKSPACE:     %WORKSPACE%
 echo PATH:          %PATH%
 echo.
 set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar