Cleanups for cygwin.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1953 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 8 insertions, 19 deletions

diff --git a/edksetup.sh b/edksetup.sh
index 7a3fe33a8f..feb1ba7cb2 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" == "" ]
@@ -29,17 +33,6 @@ then
   echo "Please set XMLBEANS_HOME before sourcing this script."
 else
   
-case "`uname`" in
-  CYGWIN*) 
-    # Convert paths to unix format.
-    # This is to remove possible wrong path when converting CLASSPATH back to windows format
-    export WORKSPACE=`cygpath -u $WORKSPACE`
-    export ANT_HOME=`cygpath -u $ANT_HOME`
-    export XMLBEANS_HOME=`cygpath -u $XMLBEANS_HOME`
-    export FRAMEWORK_TOOLS_PATH=`cygpath -u $FRAMEWORK_TOOLS_PATH`
-    ;;
-esac
-
 # 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=$CLASSPATH:$WORKSPACE/Tools/Jars/Common.jar
@@ -47,18 +40,14 @@ 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 -p $ANT_HOME`
-    export XMLBEANS_HOME=`cygpath -w -p $XMLBEANS_HOME`
+    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`
     ;;