summaryrefslogtreecommitdiff
path: root/BaseTools/BuildEnv
diff options
context:
space:
mode:
authorqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>2010-07-21 02:46:15 +0000
committerqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>2010-07-21 02:46:15 +0000
commit14c48571ae607277d11132c5e085d3ec1f12d236 (patch)
tree441ca75db8490ac7be9261744c446b76261da53b /BaseTools/BuildEnv
parentd39c2afe2ed0ef6dadd5299843ad169c691443c6 (diff)
downloadedk2-platforms-14c48571ae607277d11132c5e085d3ec1f12d236.tar.xz
Sync EDKII BaseTools to BaseTools project r1997
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10680 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/BuildEnv')
-rwxr-xr-xBaseTools/BuildEnv23
1 files changed, 8 insertions, 15 deletions
diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index 144be280da..ca8a5781f6 100755
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -28,7 +28,7 @@ SetWorkspace() {
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 @@ SetEdkToolsPath() {
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 @@ SetEdkToolsPath() {
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 @@ AddEdkToolsToPath() {
#
if [ -z "$EDK_TOOLS_PATH" ]
then
- return -1
+ return 1
fi
EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
@@ -183,7 +176,7 @@ AddEdkToolsToPath() {
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 @@ ScriptMain() {
if [ -z $WORKSPACE ]
then
echo "Failure setting WORKSPACE"
- return -1
+ return 1
fi
RestorePreviousConfiguration
@@ -235,14 +228,14 @@ ScriptMain() {
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