Make use of wildcards in buildfiles

1 files changed, 6 insertions, 30 deletions

diff --git a/buildfile b/buildfile
index 44d460f..38316ba 100644
--- a/buildfile
+++ b/buildfile
@@ -6,35 +6,11 @@ define sh: file
 sh{*}: extension =
 sh{*}: install = bin/
 
-s = cl-11-32     lib-11-32     link-11-32     mt-11-32     rc-11-32     \
-    msvc-11/{msvc-11-32}                                                \
-                                                                        \
-    cl-12-32     lib-12-32     link-12-32     mt-12-32     rc-12-32     \
-    msvc-12/{msvc-12-32}                                                \
-                                                                        \
-    cl-14u0-32   lib-14u0-32   link-14u0-32   mt-14u0-32   rc-14u0-32   \
-    msvc-14/{msvc-14u0-32}                                              \
-                                                                        \
-    cl-14u2-32   lib-14u2-32   link-14u2-32   mt-14u2-32   rc-14u2-32   \
-    cl-14u2-64   lib-14u2-64   link-14u2-64   mt-14u2-64   rc-14u2-64   \
-    msvc-14/{msvc-14u2-32 msvc-14u2-64}                                 \
-                                                                        \
-    cl-14u3-32   lib-14u3-32   link-14u3-32   mt-14u3-32   rc-14u3-32   \
-    cl-14u3-64   lib-14u3-64   link-14u3-64   mt-14u3-64   rc-14u3-64   \
-    msvc-14/{msvc-14u3-32 msvc-14u3-64}                                 \
-                                                                        \
-    cl-15u0-32   lib-15u0-32   link-15u0-32   mt-15u0-32   rc-15u0-32   \
-    cl-15u0-64   lib-15u0-64   link-15u0-64   mt-15u0-64   rc-15u0-64   \
-    msvc-15/{msvc-15u0-32 msvc-15u0-64}                                 \
-                                                                        \
-    msvc-dispatch                                                       \
-                                                                        \
-    msvc-common/{msvc-cl-common msvc-common msvc-lib-common             \
-                 msvc-link-common msvc-mt-common msvc-rc-common         \
-                 msvc-sdk-common}
-
-
-./: msvc-common/exe{msvc-filter} sh{$s}                     \
+# @@ Change to 'sh{cl-* lib-* link-* mt-* rc-*}' when supported.
+#
+./: msvc-common/exe{msvc-filter}                            \
+    sh{cl-* +lib-* +link-* +mt-* +rc-*}                     \
+    sh{msvc-** -msvc-common/msvc-filter*}                   \
     doc{INSTALL LICENSE NEWS README version} file{manifest}
 
 doc{version}: file{manifest} # Generated by the version module.
@@ -44,7 +20,7 @@ msvc-common/:
 {
   import libs = libbutl%lib{butl}
 
-  exe{msvc-filter}: cxx{msvc-filter} hxx{version} $libs
+  exe{msvc-filter}: {hxx ixx txx cxx}{* -version} hxx{version} $libs
 
   hxx{version}: in{version} $src_root/file{manifest}
   hxx{version}: dist = true