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

diff --git a/edksetup.bat b/edksetup.bat
index 34a3adc12b..f098e17612 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -32,9 +32,12 @@ if defined VS71COMNTOOLS (
 
 :check_java
 if "%JAVA_HOME%"=="" goto no_jdk
+echo.
+echo JAVA_HOME:     %JAVA_HOME%
 
 @REM Set the WORKSPACE to the Current Working Directory
 set WORKSPACE=%~dp0
+echo WORKSPACE:     %WORKSPACE%
 
 :set_cygwin
 if not defined CYGWIN_HOME (
@@ -43,35 +46,41 @@ if not defined CYGWIN_HOME (
     echo !!! Not set CYGWIN_HOME, gcc build may not be used !!!
     echo.
   )
+) else (
+  echo CYGWIN_HOME:   %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
+echo ANT_HOME:      %ANT_HOME%
+if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib
+
+if "%XMLBEANS_HOME%"=="" goto no_xmlbeans
+echo XMLBEANS_HOME: %XMLBEANS_HOME%
+
 set Framework_Tools_Path=%WORKSPACE%\Tools\bin
 
-echo.
-echo WORKSPACE: %WORKSPACE%
-echo ANT_HOME:  %ANT_HOME%
-echo JAVA_HOME: %JAVA_HOME%
 
-if "%PATHBACKUP%"=="" set PATHBACKUP=%PATH%
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATHBACKUP%;%CYGWIN_HOME%\bin
+set PATH=%Framework_Tools_Path%;%PATH%
 
 echo PATH:      %PATH%
 echo.
 
+if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8
+
+echo Building the Tiano Tools
+
 @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 +88,31 @@ 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_antcontrib
+echo.
+echo !!! Please install Ant-contrib to ANT_HOME !!!
+echo.
+goto end 
+
+:no_xmlbeans
+echo.
+echo !!! Please install XML Beans, and set XMLBEANS_HOME !!!
+echo.
+goto end 
+
+:no_saxon8
+echo.
+echo !!! Please copy saxon8.jar file to XMLBEANS_HOME\lib !!!
 echo.
 goto end