X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.sh;h=57368b56afacf4822b4f423aabb8d0f521589ca5;hp=7285dfe8d15b3d7966090fc7fcd05f730f3b1fce;hb=d967d6d96fc18d7a53d32223f5813b12cda19e8d;hpb=ef9086c3a52572fbd7f9c16e57093086224ce914

diff --git a/edksetup.sh b/edksetup.sh
index 7285dfe8d1..57368b56af 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -30,15 +30,73 @@ 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 $*
+  elif [ -n "$PACKAGES_PATH" ]
+  then 
+    PATH_LIST=$PACKAGES_PATH
+    PATH_LIST=${PATH_LIST//:/ }
+    for DIR in $PATH_LIST
+    do
+      if [ -f "$DIR/BaseTools/BuildEnv" ]
+      then
+        export EDK_TOOLS_PATH=$DIR/BaseTools
+        . $DIR/BaseTools/BuildEnv $*
+        break
+      fi
+    done
+  else
+    echo BaseTools not found in your tree, and EDK_TOOLS_PATH is not set.
+    echo Please check that WORKSPACE or PACKAGES_PATH is not set incorrectly
+    echo in your shell, or point EDK_TOOLS_PATH at the directory that contains
+    echo the EDK2 BuildEnv script.
+    return 1
   fi
 }
 
@@ -51,8 +109,8 @@ function SourceEnv()
      ]
   then
     HelpMsg
-    return
   else
+    SetWorkspace &&
     SetupEnv "$*"
   fi
 }
@@ -60,11 +118,15 @@ function SourceEnv()
 if [ $# -gt 1 ]
 then
   HelpMsg
-  return
-elif [ $# -eq 1 ] && [ "$1" != "BaseTool" ]
+elif [ $# -eq 1 ] && [ "$1" != "BaseTools" ]
 then
   HelpMsg
-  return
+fi
+
+RETVAL=$?
+if [ $RETVAL -ne 0 ]
+then
+  return $RETVAL
 fi
 
 SourceEnv "$*"