X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=6f45077ba9b32010da3973545b4a2d74d281117e;hp=34a3adc12bf6af7b3975980711a638229c381681;hb=b9e16a843f4d97440ba6051123e096e0e71c196f;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

diff --git a/edksetup.bat b/edksetup.bat
index 34a3adc12b..6f45077ba9 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -45,8 +45,8 @@ if not defined CYGWIN_HOME (
   )
 )
 
-if "%ANT_HOME%"=="" set ANT_HOME=%WORKSPACE%\Tools\bin\apache-ant
-if "%XMLBEANS_HOME%"=="" set XMLBEANS_HOME=%WORKSPACE%\Tools\bin\xmlbeans
+if "%ANT_HOME%"=="" goto no_ant
+if "%XMLBEANS_HOME%"=="" goto no_xmlbeans
 set Framework_Tools_Path=%WORKSPACE%\Tools\bin
 
 echo.
@@ -61,17 +61,17 @@ echo PATH:      %PATH%
 echo.
 
 @REM We are going to create the SurfaceArea.jar file first so that other Java Program can use it
-set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%WORKSPACE%Tools\Jars\saxon8.jar
+set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%XMLBEANS_HOME%\lib\saxon8.jar
 
 call ant -f %WORKSPACE%Tools\build.xml SurfaceArea
 
 @REM Now we can make the other Java Programs
-set CLASSPATH=%WORKSPACE%Tools\Jars\SurfaceArea.jar;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%WORKSPACE%Tools\Jars\saxon8.jar
+set CLASSPATH=%WORKSPACE%Tools\Jars\SurfaceArea.jar;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%XMLBEANS_HOME%\lib\saxon8.jar
 
 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 using the cpp-tasks to create our tools
-set CLASSPATH=%WORKSPACE%Tools\Jars\SurfaceArea.jar;%WORKSPACE%Tools\Jars\GenBuild.jar;%WORKSPACE%Tools\Jars\cpptasks.jar;%WORKSPACE%Tools\Jars\frameworktasks.jar;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%WORKSPACE%Tools\Jars\saxon8.jar
+set CLASSPATH=%WORKSPACE%Tools\Jars\SurfaceArea.jar;%WORKSPACE%Tools\Jars\GenBuild.jar;%WORKSPACE%Tools\Jars\cpptasks.jar;%WORKSPACE%Tools\Jars\frameworktasks.jar;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%XMLBEANS_HOME%\lib\saxon8.jar
 
 call ant -f %WORKSPACE%Tools\build.xml C_Code
 
@@ -79,7 +79,19 @@ goto end
 
 :no_jdk
 echo.
-echo !!! Please set JAVA_HOME !!!
+echo !!! Please install Java, and set JAVA_HOME !!!
+echo.
+goto end 
+
+:no_ant
+echo.
+echo !!! Please install Apache Ant, and set ANT_HOME !!!
+echo.
+goto end 
+
+:no_xmlbeans
+echo.
+echo !!! Please install XML Beans, and set XMLBEANS_HOME !!!
 echo.
 goto end