#
# Restore previous configuration
#
- PREVIOUS_CONF_FILE=Conf/BuildEnv.sh2
+ PREVIOUS_CONF_FILE=Conf/BuildEnv.sh
if [ -e $PREVIOUS_CONF_FILE ]
then
echo Loading previous configuration from \$WORKSPACE/$PREVIOUS_CONF_FILE
# Write configuration to a shell script to allow for configuration to be
# easily reloaded.
#
- OUTPUT_FILE=Conf/BuildEnv.sh2
+ OUTPUT_FILE=Conf/BuildEnv.sh
#echo Storing current configuration into \$WORKSPACE/$OUTPUT_FILE
OUTPUT_FILE=$WORKSPACE/$OUTPUT_FILE
echo "# Auto-generated by ${BASH_SOURCE[0]}" > $OUTPUT_FILE
#
BIN_SUB_DIR=`GetBaseToolsBinSubDir`
- if [ -e $EDK_TOOLS_PATH/PseudoBin/$BIN_SUB_DIR ]
+ if [ -e $EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR ]
then
- EDK_TOOLS_PATH_BIN=$EDK_TOOLS_PATH/PseudoBin/$BIN_SUB_DIR
+ EDK_TOOLS_PATH_BIN=$EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR
else
EDK_TOOLS_PATH_BIN=$EDK_TOOLS_PATH/Bin/$BIN_SUB_DIR
fi
CopySingleTemplateFile() {
- SRC_FILENAME=BaseTools/Conf/$1.template
+ SRC_FILENAME=Conf/$1.template
DST_FILENAME=Conf/$1.txt
if [ -e $WORKSPACE/$DST_FILENAME ]
return
fi
- echo "Copying \$WORKSPACE/$SRC_FILENAME"
+ echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME"
echo " to \$WORKSPACE/$DST_FILENAME"
- SRC_FILENAME=$WORKSPACE/$SRC_FILENAME
+ SRC_FILENAME=$EDK_TOOLS_PATH/$SRC_FILENAME
DST_FILENAME=$WORKSPACE/$DST_FILENAME
cp $SRC_FILENAME $DST_FILENAME