Added CONST for some sting type to follow MWG-0.51. Tracker 26 and 28

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 34a3adc12bf6af7b3975980711a638229c381681..f098e17612617a6346daed07ebb612940478a5e5 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,35 +46,41 @@ 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%"=="" 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
+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
+set PATH=%Framework_Tools_Path%;%PATH%\r
 \r
 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;%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 +88,31 @@ 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_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