BaseTools/BuildEnv: Do not modify the env 'PACKAGES_PATH' in BuildEnv

https://bugzilla.tianocore.org/show_bug.cgi?id=236

The script 'BuildEnv' modifies the value of the environment variable
'PACKAGES_PATH' (line 44). The script will substitute the ':' symbol
(separating multiple paths) with a space.

This is not supposed to happen since users might later use 'PACKAGES_PATH'
during the code-building process under a multiple-workspace scenario.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Hao Wu 2016-11-16 16:35:56 +08:00
parent 4e7872d2f7
commit b4dc05e854

View File

@ -2,7 +2,7 @@
# Setup the environment for unix-like systems running a bash-like shell. # Setup the environment for unix-like systems running a bash-like shell.
# This file must be "sourced" not merely executed. For example: ". edksetup.sh" # This file must be "sourced" not merely executed. For example: ". edksetup.sh"
# #
# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR> # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -41,8 +41,8 @@ RestorePreviousConfiguration() {
export CONF_PATH=$WORKSPACE/Conf export CONF_PATH=$WORKSPACE/Conf
if [ ! -d $WORKSPACE/Conf ] && [ -n "$PACKAGES_PATH" ] if [ ! -d $WORKSPACE/Conf ] && [ -n "$PACKAGES_PATH" ]
then then
PACKAGES_PATH=${PACKAGES_PATH//:/ } PATH_LIST=${PACKAGES_PATH//:/ }
for DIR in $PACKAGES_PATH for DIR in $PATH_LIST
do do
if [ -d $DIR/Conf ] if [ -d $DIR/Conf ]
then then
@ -138,8 +138,8 @@ SetEdkToolsPath() {
# #
if [ -n "$PACKAGES_PATH"] if [ -n "$PACKAGES_PATH"]
then then
PACKAGES_PATH=${PACKAGES_PATH//:/ } PATH_LIST=${PACKAGES_PATH//:/ }
for DIR in $PACKAGES_PATH for DIR in $PATH_LIST
do do
if [ -d $DIR/BaseTools ] if [ -d $DIR/BaseTools ]
then then