aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--buildfile10
-rw-r--r--libbutl/buildfile2
-rw-r--r--tests/curl/buildfile2
-rw-r--r--tests/dir-iterator/buildfile2
-rw-r--r--tests/entry-time/buildfile2
-rw-r--r--tests/manifest-roundtrip/buildfile2
-rw-r--r--tests/mventry/buildfile2
-rw-r--r--tests/openssl/buildfile2
-rw-r--r--tests/path-entry/buildfile2
-rw-r--r--tests/process-run/buildfile2
-rw-r--r--tests/process/buildfile2
-rw-r--r--tests/regex/buildfile2
-rw-r--r--tests/sendmail/buildfile2
-rw-r--r--tests/standard-version/buildfile2
-rw-r--r--tests/string-parser/buildfile2
-rw-r--r--tests/tab-parser/buildfile2
-rw-r--r--tests/url/buildfile2
-rw-r--r--tests/wildcard/buildfile2
19 files changed, 18 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore
index 1943e34..cad5233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,3 @@
*.exe.dlls/
*.exe.manifest
*.pc
-
-# Generated version.
-#
-version
diff --git a/buildfile b/buildfile
index 2a5ec7a..fae51a6 100644
--- a/buildfile
+++ b/buildfile
@@ -2,15 +2,7 @@
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-./: {*/ -build/} doc{INSTALL LICENSE NEWS README version} file{manifest}
-
-# The version file is auto-generated (by the version module) from manifest.
-# Include it in distribution and don't remove when cleaning in src (so that
-# clean results in a state identical to distributed).
-#
-doc{version}: file{manifest}
-doc{version}: dist = true
-doc{version}: clean = ($src_root != $out_root)
+./: {*/ -build/} doc{INSTALL LICENSE NEWS README} manifest
# Don't install tests or the INSTALL file.
#
diff --git a/libbutl/buildfile b/libbutl/buildfile
index eee92d9..9d20e90 100644
--- a/libbutl/buildfile
+++ b/libbutl/buildfile
@@ -33,7 +33,7 @@ lib{butl}: file{*.c *.h}
# pick up an installed one) and don't remove it when cleaning in src (so that
# clean results in a state identical to distributed).
#
-hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: in{version} $src_root/manifest
hxx{version}: dist = true
hxx{version}: clean = ($src_root != $out_root)
diff --git a/tests/curl/buildfile b/tests/curl/buildfile
index 9040203..bc03cdd 100644
--- a/tests/curl/buildfile
+++ b/tests/curl/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/dir-iterator/buildfile b/tests/dir-iterator/buildfile
index 361100d..0a9dcf4 100644
--- a/tests/dir-iterator/buildfile
+++ b/tests/dir-iterator/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/entry-time/buildfile b/tests/entry-time/buildfile
index 7219149..544c23e 100644
--- a/tests/entry-time/buildfile
+++ b/tests/entry-time/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/manifest-roundtrip/buildfile b/tests/manifest-roundtrip/buildfile
index 7b55569..0f65c29 100644
--- a/tests/manifest-roundtrip/buildfile
+++ b/tests/manifest-roundtrip/buildfile
@@ -6,4 +6,4 @@ import libs = libbutl%lib{butl}
libs += $stdmod_lib
exe{driver}: {hxx cxx}{*} $libs
-exe{driver}: file{manifest}: test.roundtrip = true
+exe{driver}: manifest: test.roundtrip = true
diff --git a/tests/mventry/buildfile b/tests/mventry/buildfile
index 3e58110..93b2ffd 100644
--- a/tests/mventry/buildfile
+++ b/tests/mventry/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/openssl/buildfile b/tests/openssl/buildfile
index f78d532..1d9882f 100644
--- a/tests/openssl/buildfile
+++ b/tests/openssl/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/path-entry/buildfile b/tests/path-entry/buildfile
index 635246c..3339fa7 100644
--- a/tests/path-entry/buildfile
+++ b/tests/path-entry/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/process-run/buildfile b/tests/process-run/buildfile
index 0802c8e..0546efb 100644
--- a/tests/process-run/buildfile
+++ b/tests/process-run/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/process/buildfile b/tests/process/buildfile
index c0fc49d..1b797b8 100644
--- a/tests/process/buildfile
+++ b/tests/process/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/regex/buildfile b/tests/regex/buildfile
index 07bcd6f..b31f9c2 100644
--- a/tests/regex/buildfile
+++ b/tests/regex/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/sendmail/buildfile b/tests/sendmail/buildfile
index 773efe0..6bdfe19 100644
--- a/tests/sendmail/buildfile
+++ b/tests/sendmail/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/standard-version/buildfile b/tests/standard-version/buildfile
index 57fd517..44bee4c 100644
--- a/tests/standard-version/buildfile
+++ b/tests/standard-version/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/string-parser/buildfile b/tests/string-parser/buildfile
index b279250..9378520 100644
--- a/tests/string-parser/buildfile
+++ b/tests/string-parser/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/tab-parser/buildfile b/tests/tab-parser/buildfile
index 57fd517..44bee4c 100644
--- a/tests/tab-parser/buildfile
+++ b/tests/tab-parser/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/url/buildfile b/tests/url/buildfile
index ed8380c..895de8f 100644
--- a/tests/url/buildfile
+++ b/tests/url/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/wildcard/buildfile b/tests/wildcard/buildfile
index 4ec6488..467e4d0 100644
--- a/tests/wildcard/buildfile
+++ b/tests/wildcard/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
libs += $stdmod_lib
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript