From ead1bded123556f3aa7d716c4e009d342b891a20 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Mon, 14 Nov 2016 09:35:45 +0100 Subject: Add feature shortcuts matching ci system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These features (shortcuts) do activate the feature set for: - the changeset builds (agl-ci-change-features) - the snapshot builds (agl-ci-snapshot-features) Change-Id: I4972f61b070836fedef8e06d32deaf07b8978dfb Signed-off-by: Jan-Simon Möller --- scripts/.aglsetup_genconfig.bash | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'scripts') diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index 285ecee50..31520a7cc 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -123,6 +123,24 @@ function find_feature_dir() { return 1 } +function process-feature-shortcuts() { + TOCHECK=$1 + debug "processing feature shortcut $TOCHECK" + if $(echo "$FEATURES" | grep -q "$TOCHECK" 2>&1 ) ; then + featuredir=$(find_feature_dir $TOCHECK) + if test -d $featuredir; then + tmpfeatures="$FEATURES $(cat $featuredir/included.inc)" + tmpfeatures_uniq=$(echo $tmpfeatures | sed -e "s/$TOCHECK//g" -e 's/ / /g' | tr "[:blank:]" "\n" | sort -u ) + export FEATURES=$tmpfeatures_uniq + debug "Features used: $FEATURES" + else + error "No feature directory with this name: $TOCHECK" + exit 1 + fi + fi +} + + function usage() { cat <&2 Usage: . $SCRIPT [options] [feature [feature [... ]]] @@ -306,6 +324,9 @@ verbose "Command line arguments: ${GLOBAL_ARGS[@]}" # the remaining args are the features FEATURES="$@" +process-feature-shortcuts agl-all-features +process-feature-shortcuts agl-ci-change-features +process-feature-shortcuts agl-ci-snapshot-features # validate the machine list debug "validating machines list" -- cgit 1.2.3-korg