Make scripts work from $WORKSPACE/BaseTools.

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

diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index fcca6c9069dc74a89ee449aa8242182c8e940ce9..08a84d4352f8ea0473a75c7aba393ddba3f48112 100644 (file)
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -11,11 +11,11 @@
 # Setup the environment for unix-like systems running a bash-like shell.
 # This file must be "sourced" not merely executed. For example: ". edksetup.sh"
 
-if [ ! -e ./Tools/BaseTools/BuildEnv.py ]
+if [ ! -e ./BaseTools/BuildEnv.py ]
 then
   echo Run this script from the base of your tree.  For example:
   echo "  cd /Path/To/Edk/Root"
-  echo "  . Tools/BuildEnv"
+  echo "  . BaseTools/BuildEnv"
   return
 fi
 
@@ -23,7 +23,7 @@ fi
 # First, we run a python tool that will ask the user to configure
 # the environment in a (relatively) user friendly manner.
 #
-python ./Tools/BaseTools/BuildEnv.py $*
+python ./BaseTools/BuildEnv.py $*
 
 #
 # The python tool will write ./Conf/BuildEnv.sh to actually configure

diff --git a/BaseTools/BuildEnv.py b/BaseTools/BuildEnv.py
index 7b3d192a0accb8be2932778cefcf1fd639c0b59a..98b5ca1f457d34995c8c35a3b70668d52929ca25 100755 (executable)
--- a/BaseTools/BuildEnv.py
+++ b/BaseTools/BuildEnv.py
@@ -65,7 +65,7 @@ class SetupBuildEnvironmentApp:
       }\r
 \r
   def ProcessCommandLine(self):\r
-    Parser = OptionParser(description=__copyright__,version=__version__,prog="Tools/BuildEnv")\r
+    Parser = OptionParser(description=__copyright__,version=__version__,prog="BaseTools/BuildEnv")\r
     Parser.add_option("-q", "--quiet", action="store_true", type=None, help="Disable all messages except FATAL ERRORS.")\r
     Parser.add_option("-v", "--verbose", action="store_true", type=None, help="Turn on verbose output with informational messages printed, "\\r
                                                                                "including library instances selected, final dependency expression, "\\r
@@ -198,7 +198,7 @@ class SetupBuildEnvironmentApp:
     todo = self.conf['templates and Conf directory']\r
     workspace = os.path.realpath(self.Opt.workspace)\r
     templatesDir = \\r
-      os.path.join(workspace, 'Tools', 'BaseTools', 'ConfTemplates', sys.platform.title())\r
+      os.path.join(workspace, 'BaseTools', 'ConfTemplates', sys.platform.title())\r
     confDir = \\r
       os.path.join(workspace, 'Conf')\r
     print\r
@@ -249,12 +249,18 @@ class SetupBuildEnvironmentApp:
     print >> script, 'export TOOLCHAIN="%s"' % self.conf['compiler']\r
     print >> script, 'export EDK_CC_PATH_PREFIX="%s"' % self.conf['compiler-prefix']\r
 \r
+    EDK_TOOLS_PATH = os.path.join(workspace, 'BaseTools')\r
+    print >> script, 'if [ $EDK_TOOLS_PATH=="" ]'\r
+    print >> script, 'then'\r
+    print >> script, '  export EDK_TOOLS_PATH="%s"' % EDK_TOOLS_PATH\r
+    print >> script, 'fi'\r
+\r
     #\r
     # Change PATH variable\r
     #\r
     newPath = os.environ['PATH'].split(os.path.pathsep)\r
     binDir = \\r
-      os.path.join(workspace, 'Tools', 'BaseTools', 'Bin', sys.platform.title())\r
+      os.path.join(workspace, 'BaseTools', 'Bin', sys.platform.title())\r
     if binDir not in newPath:\r
       newPath.append(binDir)\r
     newPath = os.path.pathsep.join(newPath)\r