X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.sh;h=f7bae8476404ae4a535545930b7cb75a6ff0d60b;hp=08e62bc87757e5e77c3d8fc1642f1312fee0d655;hb=51ac2ffdab2124694a466b56283440414e51780c;hpb=d14ebb43742f411f2a013996b8e76bcab2420552

diff --git a/edksetup.sh b/edksetup.sh
index 08e62bc877..f7bae84764 100644
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -9,11 +9,15 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 # Setup the environment for unix-like systems running a bash-like shell.
-# This file must be "sourced" notcuted. For example: ". edksetup.sh"
+# This file must be "sourced" not merely executed. For example: ". edksetup.sh"
+
+# CYGWIN users: Your path and filename related environment variables should be
+# set up in the unix style.  This script will make the necessary conversions to
+# windows style.
 
 export WORKSPACE=$(pwd)
 
-# In unix-like system, gcc is the compiler for building tools
+# In unix-like systems, gcc is the compiler for building tools
 export TOOL_CHAIN=gcc
 
 if [ "$JAVA_HOME" == "" ]
@@ -28,23 +32,22 @@ if [ "$XMLBEANS_HOME" == "" ]
 then
   echo "Please set XMLBEANS_HOME before sourcing this script."
 else
-
+  
 # These should be ok as they are.
-export CLASSPATH=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/PcdTools.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=$ANT_HOME/lib/ant-contrib.jar:$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/PcdTools.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:$XMLBEANS_HOME/lib/saxon8-dom.jar:$XMLBEANS_HOME/lib/saxon8-xpath.jar
 export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/Common.jar
-export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Bin/FrameworkWizard.jar
+export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/PcdTools.jar
+export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/bin/FrameworkWizard.jar
 export FRAMEWORK_TOOLS_PATH=$WORKSPACE/Tools/bin
 export PATH=$FRAMEWORK_TOOLS_PATH:$ANT_HOME/bin:$JAVA_HOME/bin:$PATH
-# In some unix-like system, following export is to export system's environment to user's environment
-export ANT_HOME=$ANT_HOME
-export JAVA_HOME=$JAVA_HOME
-export XMLBEANS_HOME=$XMLBEANS_HOME
 
 # Handle any particulars down here.
 case "`uname`" in
   CYGWIN*) 
     # Convert paths to windows format.
     export WORKSPACE=`cygpath -w $WORKSPACE`
+    export ANT_HOME=`cygpath -w $ANT_HOME`
+    export XMLBEANS_HOME=`cygpath -w $XMLBEANS_HOME`
     export CLASSPATH=`cygpath -w -p $CLASSPATH`
     export FRAMEWORK_TOOLS_PATH=`cygpath -w -p $FRAMEWORK_TOOLS_PATH`
     ;;