Modified to handle XMLBEANS_HOME

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

diff --git a/edksetup.bat b/edksetup.bat
index 6f45077ba9b32010da3973545b4a2d74d281117e..23c2acdb871f365864e932726867b03512f82d42 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -32,9 +32,12 @@ if defined VS71COMNTOOLS (
 \r
 :check_java\r
 if "%JAVA_HOME%"=="" goto no_jdk\r
+echo.\r
+echo JAVA_HOME:     %JAVA_HOME%\r
 \r
 @REM Set the WORKSPACE to the Current Working Directory\r
 set WORKSPACE=%~dp0\r
+echo WORKSPACE:     %WORKSPACE%\r
 \r
 :set_cygwin\r
 if not defined CYGWIN_HOME (\r
@@ -43,16 +46,19 @@ if not defined CYGWIN_HOME (
     echo !!! Not set CYGWIN_HOME, gcc build may not be used !!!\r
     echo.\r
   )\r
+) else (\r
+  echo CYGWIN_HOME:   %CYGWIN_HOME%\r
 )\r
 \r
 if "%ANT_HOME%"=="" goto no_ant\r
+echo ANT_HOME:      %ANT_HOME%\r
+if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib\r
+\r
 if "%XMLBEANS_HOME%"=="" goto no_xmlbeans\r
+echo XMLBEANS_HOME: %XMLBEANS_HOME%\r
+\r
 set Framework_Tools_Path=%WORKSPACE%\Tools\bin\r
 \r
-echo.\r
-echo WORKSPACE: %WORKSPACE%\r
-echo ANT_HOME:  %ANT_HOME%\r
-echo JAVA_HOME: %JAVA_HOME%\r
 \r
 if "%PATHBACKUP%"=="" set PATHBACKUP=%PATH%\r
 set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATHBACKUP%;%CYGWIN_HOME%\bin\r
@@ -60,6 +66,10 @@ set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bi
 echo PATH:      %PATH%\r
 echo.\r
 \r
+if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8\r
+\r
+echo Building the Tiano Tools\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;%XMLBEANS_HOME%\lib\saxon8.jar\r
 \r
@@ -89,12 +99,24 @@ echo !!! Please install Apache Ant, and set ANT_HOME !!!
 echo.\r
 goto end \r
 \r
+:no_antcontrib\r
+echo.\r
+echo !!! Please install Ant-contrib to 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
+:no_saxon8\r
+echo.\r
+echo !!! Please copy saxon8.jar file to XMLBEANS_HOME\lib !!!\r
+echo.\r
+goto end \r
+\r
 :end\r
 @echo on\r
 \r