BaseTools: Use pip module if available, CI uses it by default
Use the new edk2-basetools pip module. Includes a helpful message in setup to let users know which has been selected. Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Yuwei Chen <yuwei.chen@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com> Reviewed-by: Yuwei <Chen<yuwei.chen@intel.com> Signed-off-by: Matthew Carlson <matthewfcarlson@gmail.com>
This commit is contained in:
committed by
mergify[bot]
parent
ecc267fec5
commit
1534b6228b
@@ -46,7 +46,7 @@ RestorePreviousConfiguration() {
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh
|
||||
if [ -e $PREVIOUS_CONF_FILE ]
|
||||
then
|
||||
@@ -198,7 +198,17 @@ AddEdkToolsToPath() {
|
||||
|
||||
EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
|
||||
|
||||
AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
|
||||
# check if the edk2basetools pip package is available
|
||||
if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then
|
||||
# if it is, use the pip version of the wrappers
|
||||
echo "Using Pip Basetools"
|
||||
AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike
|
||||
else
|
||||
echo "Using EDK2 in-source Basetools"
|
||||
AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
|
||||
fi
|
||||
|
||||
|
||||
AddDirToStartOfPath $EDK_TOOLS_PATH_BIN
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user