1) Add byte element checking for a PCD who using byte array type datum.

[mirror_edk2.git] / edksetup.sh

diff --git a/edksetup.sh b/edksetup.sh
index 591f121d96f12d4dc04c8f09ca143f86ccbe247b..c60af892548c5757d6fb01b1d0ccfe3b2b22e806 100644 (file)
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -19,13 +19,15 @@ if [ "$JAVA_HOME" == "" ]
 then
   echo "Please set JAVA_HOME before sourcing this script."
 else
+if [ "$ANT_HOME" == "" ]
+then
+  echo "Please set ANT_HOME before sourcing this script."
+else
 
 # These should be ok as they are.
-export ANT_HOME=$WORKSPACE/Tools/bin/apache-ant
-export XMLBEANS_HOME=$WORKSPACE/Tools/bin/xmlbeans
-export CLASSPATH=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/saxon8.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/GenBuild.jar:$XMLBEANS_HOME/lib/resolver.jar:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/xmlpublic.jar:$XMLBEANS_HOME/lib/jsr173_1.0_api.jar:$XMLBEANS_HOME/lib/saxon8.jar:$XMLBEANS_HOME/lib/xbean_xpath.jar
-export Framework_Tools_Path=$WORKSPACE/Tools/bin
-export PATH=$Framework_Tools_Path:$ANT_HOME/bin:$JAVA_HOME/bin:$PATH
+export CLASSPATH=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/GenBuild.jar:$XMLBEANS_HOME/lib/resolver.jar:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/xmlpublic.jar:$XMLBEANS_HOME/lib/jsr173_1.0_api.jar:$XMLBEANS_HOME/lib/saxon8.jar:$XMLBEANS_HOME/lib/xbean_xpath.jar
+export FRAMEWORK_TOOLS_PATH=$WORKSPACE/Tools/bin
+export PATH=$FRAMEWORK_TOOLS_PATH:$ANT_HOME/bin:$JAVA_HOME/bin:$PATH
 
 # Handle any particulars down here.
 case "`uname`" in
@@ -37,6 +39,7 @@ case "`uname`" in
 esac
 
 # Now we need to build the tools.
-echo "If you have not done so, please build the tools by issuing 'ant -f \$WORKSPACE/Tools/build.xml'."
+(cd Tools; ant -noclasspath)
+fi
 fi
 fi