aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-07-15 14:22:14 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-07-15 22:09:03 +0300
commitaab62d018ee070f64ea51b7201cc3c7143284bb7 (patch)
treea9c3f2c02621d36474f1c1a2f8d65aedd84d6f31
parentdbec04d72bfe55b5f0221e7f06418deef5f541bc (diff)
Make use of wildcards in buildfiles
-rw-r--r--buildfile7
-rw-r--r--cutl/buildfile38
-rw-r--r--tests/buildfile4
-rw-r--r--tests/compiler/buildfile7
-rw-r--r--tests/compiler/cxx-indenter/buildfile2
-rw-r--r--tests/compiler/sloc-counter/buildfile2
-rw-r--r--tests/compiler/traversal/buildfile2
-rw-r--r--tests/container/buildfile7
-rw-r--r--tests/container/multi-index/buildfile2
-rw-r--r--tests/fs/buildfile7
-rw-r--r--tests/fs/path/buildfile2
-rw-r--r--tests/re/buildfile2
-rw-r--r--tests/shared-ptr/buildfile2
13 files changed, 14 insertions, 70 deletions
diff --git a/buildfile b/buildfile
index cbf55f2..9468ebb 100644
--- a/buildfile
+++ b/buildfile
@@ -2,11 +2,10 @@
# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
# license : MIT; see accompanying LICENSE file
-d = cutl/ tests/
-./: $d doc{INSTALL LICENSE NEWS README version} file{manifest}
-include $d
+./: {*/ -build/ -doc/ -m4/} doc{INSTALL LICENSE NEWS README version} \
+ file{manifest}
# Don't install tests or the INSTALL file.
#
-dir{tests/}: install = false
+dir{tests/}: install = false
doc{INSTALL}@./: install = false
diff --git a/cutl/buildfile b/cutl/buildfile
index 88eadd5..8690879 100644
--- a/cutl/buildfile
+++ b/cutl/buildfile
@@ -2,41 +2,9 @@
# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
# license : MIT; see accompanying LICENSE file
-lib{cutl}: \
- {hxx cxx}{ exception } \
- {hxx }{ re } \
- re/{ txx cxx}{ re } \
- {hxx }{ shared-ptr } \
- shared-ptr/{hxx ixx txx cxx}{ base } \
- {hxx }{ static-ptr } \
- {hxx }{ version } \
- compiler/{hxx txx }{ code-stream } \
- compiler/{hxx txx cxx}{ context } \
- compiler/{hxx ixx txx cxx}{ cxx-indenter } \
- compiler/{hxx txx }{ sloc-counter } \
- compiler/{hxx txx }{ traversal } \
- compiler/{hxx ixx txx }{ type-id } \
- compiler/{hxx ixx cxx}{ type-info } \
- container/{hxx }{ any } \
- container/{hxx txx }{ graph } \
- container/{hxx }{ key } \
- container/{hxx }{ map-iterator } \
- container/{hxx }{ multi-index } \
- container/{hxx }{ pointer-iterator } \
- details/{hxx }{ config.hxx } \
- details/{hxx }{ export.hxx } \
-details/build2/{h }{ config } \
-details/build2/{h }{ config-vc } \
- fs/{hxx cxx}{ auto-remove } \
- fs/{hxx cxx}{ exception } \
- fs/{hxx ixx txx cxx}{ path } \
- meta/{hxx }{ answer } \
- meta/{hxx }{ class-p } \
- meta/{hxx }{ polymorphic-p } \
- meta/{hxx }{ remove-c } \
- meta/{hxx }{ remove-cv } \
- meta/{hxx }{ remove-p } \
- meta/{hxx }{ remove-v }
+lib{cutl}: {hxx ixx txx cxx}{** -version -xml/** -details/boost/**} \
+ {hxx}{version} \
+details/build2/{h}{*}
hxx{version}: in{version} $src_root/file{manifest}
hxx{version}: dist = true
diff --git a/tests/buildfile b/tests/buildfile
index 8b70176..e632a04 100644
--- a/tests/buildfile
+++ b/tests/buildfile
@@ -2,6 +2,4 @@
# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
# license : MIT; see accompanying LICENSE file
-d = compiler/ container/ fs/ re/ shared-ptr/
-./: $d
-include $d
+./: {*/ -build/ -xml/}
diff --git a/tests/compiler/buildfile b/tests/compiler/buildfile
deleted file mode 100644
index 8d756ad..0000000
--- a/tests/compiler/buildfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# file : tests/compiler/buildfile
-# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
-# license : MIT; see accompanying LICENSE file
-
-d = cxx-indenter/ sloc-counter/ traversal/
-./: $d
-include $d
diff --git a/tests/compiler/cxx-indenter/buildfile b/tests/compiler/cxx-indenter/buildfile
index f764b10..722e050 100644
--- a/tests/compiler/cxx-indenter/buildfile
+++ b/tests/compiler/cxx-indenter/buildfile
@@ -4,5 +4,5 @@
import libs = libcutl%lib{cutl}
-exe{driver}: cxx{driver} $libs
+exe{driver}: {hxx cxx}{*} $libs
exe{driver}: test.output = output.std
diff --git a/tests/compiler/sloc-counter/buildfile b/tests/compiler/sloc-counter/buildfile
index c149abf..4cb7c09 100644
--- a/tests/compiler/sloc-counter/buildfile
+++ b/tests/compiler/sloc-counter/buildfile
@@ -4,4 +4,4 @@
import libs = libcutl%lib{cutl}
-exe{driver}: cxx{driver} $libs test{testscript}
+exe{driver}: {hxx cxx}{* -test} $libs test{testscript}
diff --git a/tests/compiler/traversal/buildfile b/tests/compiler/traversal/buildfile
index f859036..791a74b 100644
--- a/tests/compiler/traversal/buildfile
+++ b/tests/compiler/traversal/buildfile
@@ -4,5 +4,5 @@
import libs = libcutl%lib{cutl}
-exe{driver}: cxx{driver} $libs
+exe{driver}: {hxx cxx}{*} $libs
exe{driver}: test.output = output.std
diff --git a/tests/container/buildfile b/tests/container/buildfile
deleted file mode 100644
index 3a6d663..0000000
--- a/tests/container/buildfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# file : tests/container/buildfile
-# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
-# license : MIT; see accompanying LICENSE file
-
-d = multi-index/
-./: $d
-include $d
diff --git a/tests/container/multi-index/buildfile b/tests/container/multi-index/buildfile
index 36d0bea..a77e23d 100644
--- a/tests/container/multi-index/buildfile
+++ b/tests/container/multi-index/buildfile
@@ -4,4 +4,4 @@
import libs = libcutl%lib{cutl}
-exe{driver}: cxx{driver} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/fs/buildfile b/tests/fs/buildfile
deleted file mode 100644
index 65d20de..0000000
--- a/tests/fs/buildfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# file : tests/fs/buildfile
-# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
-# license : MIT; see accompanying LICENSE file
-
-d = path/
-./: $d
-include $d
diff --git a/tests/fs/path/buildfile b/tests/fs/path/buildfile
index 9809400..3fc481b 100644
--- a/tests/fs/path/buildfile
+++ b/tests/fs/path/buildfile
@@ -4,4 +4,4 @@
import libs = libcutl%lib{cutl}
-exe{driver}: cxx{driver} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/re/buildfile b/tests/re/buildfile
index ba86f09..8373da0 100644
--- a/tests/re/buildfile
+++ b/tests/re/buildfile
@@ -4,4 +4,4 @@
import libs = libcutl%lib{cutl}
-exe{driver}: cxx{driver} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/shared-ptr/buildfile b/tests/shared-ptr/buildfile
index fe53cc4..592f317 100644
--- a/tests/shared-ptr/buildfile
+++ b/tests/shared-ptr/buildfile
@@ -4,4 +4,4 @@
import libs = libcutl%lib{cutl}
-exe{driver}: cxx{driver} $libs
+exe{driver}: {hxx cxx}{*} $libs