edksetup.sh, BaseTools/BuildEnv: add --reconfig support

Add command line option --reconfig to edksetup.sh, forcing cached
copies of Conf/*.txt to be overwritten.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Leif Lindholm 2016-10-20 16:29:46 +01:00
parent 44f7942558
commit c112e371ce
2 changed files with 12 additions and 1 deletions

View File

@ -3,6 +3,7 @@
# 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 - 2015, Intel Corporation. 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
# which accompanies this distribution. The full text of the license may be found at # which accompanies this distribution. The full text of the license may be found at
@ -215,7 +216,7 @@ CopySingleTemplateFile() {
if [ -e $DST_FILENAME ] if [ -e $DST_FILENAME ]
then then
return [ $RECONFIG != TRUE ] && return
fi fi
echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME" echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME"

View File

@ -24,6 +24,7 @@
# #
SCRIPTNAME="edksetup.sh" SCRIPTNAME="edksetup.sh"
RECONFIG=FALSE
function HelpMsg() function HelpMsg()
{ {
@ -35,6 +36,9 @@ function HelpMsg()
echo "Options: " echo "Options: "
echo " --help, -h, -? Print this help screen and exit." echo " --help, -h, -? Print this help screen and exit."
echo echo
echo " --reconfig Overwrite the WORKSPACE/Conf/*.txt files with the"
echo " template files from the BaseTools/Conf directory."
echo
echo Please note: This script must be \'sourced\' so the environment can be changed. echo Please note: This script must be \'sourced\' so the environment can be changed.
echo ". $SCRIPTNAME" echo ". $SCRIPTNAME"
echo "source $SCRIPTNAME" echo "source $SCRIPTNAME"
@ -121,6 +125,10 @@ do
# Ignore argument for backwards compatibility # Ignore argument for backwards compatibility
shift shift
;; ;;
--reconfig)
RECONFIG=TRUE
shift
;;
-?|-h|--help|*) -?|-h|--help|*)
HelpMsg HelpMsg
break break
@ -136,4 +144,6 @@ fi
SourceEnv SourceEnv
unset SCRIPTNAME RECONFIG
return $? return $?