X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.sh;h=3dbd60fc6c7c7586d3facae4cbf61262043e053a;hp=b191635dcc233047746e8498f60b443d1ef7b8d9;hb=9b362fe72daa9e6e626c603c4e5dc2709396e81c;hpb=0fff0c2629bb64caf30c300c4c5ad8a00b526f6c

diff --git a/edksetup.sh b/edksetup.sh
index b191635dcc..3dbd60fc6c 100644
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -25,9 +25,10 @@ then
 else
 
 # These should be ok as they are.
-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 CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/Common.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
@@ -39,7 +40,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