aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-05-19 12:53:58 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2018-05-19 12:53:58 (GMT)
commit8726d137978cc0deaccce643e998dee01c318752 (patch)
tree56883aa1e256c3764b0da7076d61b778d4b3edf4
parent8d6f42250c6c0bf3b002e717981ff485c4cb390b (diff)
Get rid of doc{version} and types for testscript and manifest in buildfiles
-rw-r--r--.gitignore4
-rw-r--r--buildfile10
-rw-r--r--libbbot/buildfile2
-rw-r--r--tests/buildtab/buildfile2
4 files changed, 3 insertions, 15 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/libbbot/buildfile b/libbbot/buildfile
index 3b53be3..f3b4a0a 100644
--- a/libbbot/buildfile
+++ b/libbbot/buildfile
@@ -10,7 +10,7 @@ lib{bbot}: {hxx ixx txx cxx}{* -version} {hxx}{version} $int_libs
# 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/buildtab/buildfile b/tests/buildtab/buildfile
index 13a5a56..99b93e1 100644
--- a/tests/buildtab/buildfile
+++ b/tests/buildtab/buildfile
@@ -5,4 +5,4 @@
import libs = libbutl%lib{butl}
import libs += libbbot%lib{bbot}
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript