|
From: <jlj...@us...> - 2012-04-02 00:20:44
|
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.
|