X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.sh;h=64795c48d2746db78b600697b29e82860a3abaca;hp=39b76e1c2258bc5bec3acc2d505269c4a2eab59e;hb=eb01c45a1f153ede2f676040b0fefdc90ef09c69;hpb=729220eacac90990e9145fd129036ffc1488e1eb

diff --git a/edksetup.sh b/edksetup.sh
index 39b76e1c22..64795c48d2 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -30,40 +30,91 @@ function HelpMsg()
   echo Please note: This script must be \'sourced\' so the environment can be changed.
   echo ". edksetup.sh" 
   echo "source edksetup.sh"
+  return 1
+}
+
+function SetWorkspace()
+{
+  #
+  # If WORKSPACE is already set, then we can return right now
+  #
+  if [ -n "$WORKSPACE" ]
+  then
+    return 0
+  fi
+
+  if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ]
+  then
+    echo Run this script from the base of your tree.  For example:
+    echo "  cd /Path/To/Edk/Root"
+    echo "  . edksetup.sh"
+    return 1
+  fi
+
+  #
+  # Check for BaseTools/BuildEnv before dirtying the user's environment.
+  #
+  if [ ! -f BaseTools/BuildEnv ] && [ -z "$EDK_TOOLS_PATH" ]
+  then
+    echo BaseTools not found in your tree, and EDK_TOOLS_PATH is not set.
+    echo Please point EDK_TOOLS_PATH at the directory that contains
+    echo the EDK2 BuildEnv script.
+    return 1
+  fi
+
+  #
+  # Set $WORKSPACE
+  #
+  export WORKSPACE=`pwd`
+
+  return 0
 }
 
 function SetupEnv()
 {
-  if [ -z "$WORKSPACE" ]
+  if [ -n "$EDK_TOOLS_PATH" ]
+  then
+    . $EDK_TOOLS_PATH/BuildEnv $*
+  elif [ -f "$WORKSPACE/BaseTools/BuildEnv" ]
   then
-    . BaseTools/BuildEnv $*
-  else
     . $WORKSPACE/BaseTools/BuildEnv $*
+  else
+    echo BaseTools not found in your tree, and EDK_TOOLS_PATH is not set.
+    echo Please check that WORKSPACE is not set incorrectly in your
+    echo shell, or point EDK_TOOLS_PATH at the directory that contains
+    echo the EDK2 BuildEnv script.
+    return 1
   fi
 }
 
 function SourceEnv()
 {
-if [ \
-     "$1" = "-?" -o \
-     "$1" = "-h" -o \
-     "$1" = "--help" \
-   ]
-then
-  HelpMsg
-  return
-else
-  SetupEnv "$*"
-fi
+  if [ \
+       "$1" = "-?" -o \
+       "$1" = "-h" -o \
+       "$1" = "--help" \
+     ]
+  then
+    HelpMsg
+  else
+    SetWorkspace &&
+    SetupEnv "$*"
+  fi
 }
-if [ $# -gt 1 ] 
+
+if [ $# -gt 1 ]
 then
   HelpMsg
-  return
-elif [ $# -eq 1 ] && [ "$1" != "BaseTool" ]
+elif [ $# -eq 1 ] && [ "$1" != "BaseTools" ]
 then
   HelpMsg
-  return
-fi 
+fi
+
+RETVAL=$?
+if [ $RETVAL -ne 0 ]
+then
+  return $RETVAL
+fi
+
 SourceEnv "$*"