Pass solution as argument(s) instead of template

2 files changed, 15 insertions, 10 deletions

diff --git a/build/meta/vctest b/build/meta/vctest
index ad4af14..d20af27 100755
--- a/build/meta/vctest
+++ b/build/meta/vctest
@@ -12,11 +12,11 @@
 # -b <base-dir>
 # -r <root-dir>
 # -o <output-file>
-# -s <vc-solution>
+# -t <template-file>
 #
 # Arguments:
 #
-# <template-file>
+# <solution-files>
 #
 trap 'exit 1' ERR
 
@@ -29,6 +29,7 @@ base=
 root=
 output=
 sln=
+input=
 
 while [ $# -gt 0 ]; do
   case $1 in
@@ -44,20 +45,20 @@ while [ $# -gt 0 ]; do
       output=$2
       shift 2
       ;;
-    -s)
-      sln=$2
+    -t)
+      input=$2
       shift 2
       ;;
     *)
-      break
+      sln="$sln $1"
+      shift
       ;;
   esac
 done
 
-input=$1
 
 if [ "$input" = "" ]; then
-  error "no input file"
+  error "no template file"
   exit 1
 fi
 
@@ -81,6 +82,7 @@ if [ "$sln" = "" ]; then
   exit 1
 fi
 
+
 m4=m4
 u2d=unix2dos
 
@@ -104,7 +106,8 @@ fi
 
 # Determine possible configurations.
 #
-sln_conf=`cat $sln | dos2unix | sed -n -e \
+for f in $sln; do
+  sln_conf=`cat $f | dos2unix | sed -n -e \
 '/^[ 	]*GlobalSection(SolutionConfigurationPlatforms).*$/{\
 : loop;\
 n;\
@@ -112,6 +115,8 @@ n;\
 s/^[ 	]*\([^=]*\) = \([^=]*\)$/\1/p;\
 b loop};\
 d' -`
+  break
+done
 
 confs=
 plats=
diff --git a/build/meta/vctest-functions.make b/build/meta/vctest-functions.make
index 984b4b9..ddfd646 100644
--- a/build/meta/vctest-functions.make
+++ b/build/meta/vctest-functions.make
@@ -25,5 +25,5 @@ $3,$3,$(notdir $2)),$(subst $(src_root),,$(src_base)))
 #
 $(out_base)/%: meta-vctest-body = \
 $(call message,meta $(dist_prefix)$4/$3,$(bld_root)/meta/vctest \
--r $(dist_prefix) -b $(dist_prefix)$4  \
--s $(if $(filter /%,$1),$1,$(dist_prefix)$4/$1) -o $(dist_prefix)$4/$3 $2)
+-r $(dist_prefix) -b $(dist_prefix)$4  -t $2 -o $(dist_prefix)$4/$3 \
+$(if $(filter /%,$1),$1,$(dist_prefix)$4/$1))