Architecture rename

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 34a3adc12bf6af7b3975980711a638229c381681..6f45077ba9b32010da3973545b4a2d74d281117e 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -45,8 +45,8 @@ if not defined CYGWIN_HOME (
   )\r
 )\r
 \r
-if "%ANT_HOME%"=="" set ANT_HOME=%WORKSPACE%\Tools\bin\apache-ant\r
-if "%XMLBEANS_HOME%"=="" set XMLBEANS_HOME=%WORKSPACE%\Tools\bin\xmlbeans\r
+if "%ANT_HOME%"=="" goto no_ant\r
+if "%XMLBEANS_HOME%"=="" goto no_xmlbeans\r
 set Framework_Tools_Path=%WORKSPACE%\Tools\bin\r
 \r
 echo.\r
@@ -61,17 +61,17 @@ echo PATH:      %PATH%
 echo.\r
 \r
 @REM We are going to create the SurfaceArea.jar file first so that other Java Program can use it\r
-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\r
+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\r
 \r
 call ant -f %WORKSPACE%Tools\build.xml SurfaceArea\r
 \r
 @REM Now we can make the other Java Programs\r
-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\r
+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\r
 \r
 call ant -f %WORKSPACE%Tools\build.xml JavaCode\r
 \r
 @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\r
-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\r
+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\r
 \r
 call ant -f %WORKSPACE%Tools\build.xml C_Code\r
 \r
@@ -79,7 +79,19 @@ goto end
 \r
 :no_jdk\r
 echo.\r
-echo !!! Please set JAVA_HOME !!!\r
+echo !!! Please install Java, and set JAVA_HOME !!!\r
+echo.\r
+goto end \r
+\r
+:no_ant\r
+echo.\r
+echo !!! Please install Apache Ant, and set ANT_HOME !!!\r
+echo.\r
+goto end \r
+\r
+:no_xmlbeans\r
+echo.\r
+echo !!! Please install XML Beans, and set XMLBEANS_HOME !!!\r
 echo.\r
 goto end \r
 \r