From 5b6ea5af7ee234c1c3690243374f152361a9a5d7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 13 Sep 2010 14:33:23 +0200 Subject: Use separate lists for configurations and platforms --- build/meta/vctest | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/build/meta/vctest b/build/meta/vctest index 5aa70eb..11959b1 100755 --- a/build/meta/vctest +++ b/build/meta/vctest @@ -113,20 +113,22 @@ s/^[ ]*\([^=]*\) = \([^=]*\)$/\1/p;\ b loop};\ d' -` -conf= +confs= +plats= for c in $sln_conf; do - build=`echo $c | sed -e 's/^\(.*\)|.*$/\1/'` - arch=`echo $c | sed -e 's/^.*|\(.*\)$/\1/'` - - if [ "$arch" = "Win32" ]; then - conf="$conf $build" - else - conf="$conf $arch/$build" - fi + conf=`echo $c | sed -e 's/^\(.*\)|.*$/\1/'` + plat=`echo $c | sed -e 's/^.*|\(.*\)$/\1/'` + + confs="$confs $conf" + plats="$plats $plat" done +confs=`echo $confs | sed -e 's/ /\n/g' - | sort -u` +plats=`echo $plats | sed -e 's/ /\n/g' - | sort -u` + export topdir -export configurations=$conf +export configurations=$confs +export platforms=$plats # Make sure the output directory exist. # -- cgit v1.1