edk2-buildtools-commits

SF.net SVN: edk2-buildtools:[1993] trunk/BaseTools/BuildEnv

[<gee...@us...>]

Revision: 1993
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=1993&view=rev
Author:   geekboy15a
Date:     2010-07-09 19:44:23 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
Fixed issue where default tools could not be found.  Also fixed invalid return values (-1) in script.

Modified Paths:
--------------
    trunk/BaseTools/BuildEnv

Modified: trunk/BaseTools/BuildEnv
===================================================================
--- trunk/BaseTools/BuildEnv	2010-07-07 18:45:51 UTC (rev 1992)
+++ trunk/BaseTools/BuildEnv	2010-07-09 19:44:23 UTC (rev 1993)
@@ -28,7 +28,7 @@
     echo Run this script from the base of your tree.  For example:
     echo "  cd /Path/To/Edk/Root"
     echo "  . BaseTools/BuildEnv"
-    return -1
+    return 1
   fi
 
   #
@@ -99,13 +99,6 @@
   fi
 
   #
-  # Figure out a uniq directory name from the uname command
-  #
-  UNAME_DIRNAME=`uname -sm`
-  UNAME_DIRNAME=${UNAME_DIRNAME// /-}
-  UNAME_DIRNAME=${UNAME_DIRNAME//\//-}
-
-  #
   # Try $WORKSPACE/Conf/EdkTools
   #
   if [ -e $WORKSPACE/Conf/EdkTools ]
@@ -124,9 +117,9 @@
   fi
 
   #
-  # Try $WORKSPACE/BaseTools/Bin/$UNAME_DIRNAME
+  # Try $WORKSPACE/BaseTools
   #
-  if [ -e $WORKSPACE/BaseTools/Bin/$UNAME_DIRNAME ]
+  if [ -e $WORKSPACE/BaseTools ]
   then
     export EDK_TOOLS_PATH=$WORKSPACE/BaseTools
     return 0
@@ -174,7 +167,7 @@
   #
   if [ -z "$EDK_TOOLS_PATH" ]
   then
-    return -1
+    return 1
   fi
 
   EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
@@ -183,7 +176,7 @@
   then
     echo "Unable to find expected bin path under \$EDK_TOOLS_PATH!"
     echo "> $EDK_TOOLS_PATH_BIN"
-    return -1
+    return 1
   fi
 
   if [ "${PATH/$EDK_TOOLS_PATH_BIN/}" == "$PATH" ]
@@ -227,7 +220,7 @@
   if [ -z $WORKSPACE ]
   then
     echo "Failure setting WORKSPACE"
-    return -1
+    return 1
   fi
 
   RestorePreviousConfiguration
@@ -235,14 +228,14 @@
   SetEdkToolsPath
   if [ -z $EDK_TOOLS_PATH ]
   then
-    return -1
+    return 1
   fi
 
   AddEdkToolsToPath
   if [ $? -ne 0 ]
   then
     echo "Failure adding EDK Tools into PATH!"
-    return -1
+    return 1
   fi
 
   StoreCurrentConfiguration


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2511] trunk/BaseTools/BuildEnv

[<jlj...@us...>]

Revision: 2511
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2511&view=rev
Author:   jljusten
Date:     2012-04-02 00:20:38 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
BaseTools/BuildEnv: Add BinWrappers/PosixLike in PATH

As before, we add a directory based on 'uname -sm' into
the path, but now we follow it with
BaseTools/BinWrappers/PosixLike. Since PosixLike is added
later in PATH, the 'uname -sm' path will take precedence.

Signed-off-by: Jordan Justen <jor...@in...>
Reviewed-by: Erik Bjorge <eri...@in...>

Modified Paths:
--------------
    trunk/BaseTools/BuildEnv

Modified: trunk/BaseTools/BuildEnv
===================================================================
--- trunk/BaseTools/BuildEnv	2012-04-01 08:34:35 UTC (rev 2510)
+++ trunk/BaseTools/BuildEnv	2012-04-02 00:20:38 UTC (rev 2511)
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2012, 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
@@ -160,6 +160,14 @@
   echo $EDK_TOOLS_PATH_BIN
 }
 
+AddDirToStartOfPath() {
+  DIRNAME=$1
+  PATH=$DIRNAME:$DIRNAME:$DIRNAME:$PATH
+  PATH=${PATH//$DIRNAME:/}
+  PATH=$DIRNAME:$PATH
+  export PATH
+}
+
 AddEdkToolsToPath() {
 
   #
@@ -172,19 +180,9 @@
 
   EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
 
-  if [ ! -e $EDK_TOOLS_PATH_BIN ]
-  then
-    echo "Unable to find expected bin path under \$EDK_TOOLS_PATH!"
-    echo "> $EDK_TOOLS_PATH_BIN"
-    return 1
-  fi
+  AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
+  AddDirToStartOfPath $EDK_TOOLS_PATH_BIN
 
-  if [ "${PATH/$EDK_TOOLS_PATH_BIN/}" == "$PATH" ]
-  then
-    export PATH=$EDK_TOOLS_PATH_BIN:$PATH
-    return 0
-  fi
-
 }
 
 CopySingleTemplateFile() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.