From 5e1725815645d1e1a33a8fce6427c764052aaf0d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 19 May 2018 16:09:27 +0300
Subject: Get rid of doc{version} and types for testscript and manifest in
 buildfiles

---
 .gitignore                              |  4 ----
 bbot/buildfile                          |  2 +-
 buildfile                               | 11 +----------
 tests/agent/buildfile                   |  2 +-
 tests/integration/buildfile             |  2 +-
 tests/machine/buildfile                 |  2 +-
 unit-tests/bootstrap-manifest/buildfile |  2 +-
 unit-tests/machine-manifest/buildfile   |  2 +-
 8 files changed, 7 insertions(+), 20 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/bbot/buildfile b/bbot/buildfile
index e6df687..3675ee6 100644
--- a/bbot/buildfile
+++ b/bbot/buildfile
@@ -38,7 +38,7 @@ libu{bbot}: {hxx ixx txx cxx}{* -common-options -version} \
             {hxx ixx cxx}{common-options} {hxx}{version}  \
             $libs
 
-hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: in{version} $src_root/manifest
 
 # Generated options parser.
 #
diff --git a/buildfile b/buildfile
index 41dafdc..49895fe 100644
--- a/buildfile
+++ b/buildfile
@@ -2,16 +2,7 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : TBC; see accompanying LICENSE file
 
-./: {*/ -tests/ -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)
+./: {*/ -tests/ -build/} doc{INSTALL LICENSE NEWS README} manifest
 
 # Don't install tests or the INSTALL file.
 #
diff --git a/tests/agent/buildfile b/tests/agent/buildfile
index 8775cbd..9d91446 100644
--- a/tests/agent/buildfile
+++ b/tests/agent/buildfile
@@ -6,5 +6,5 @@
 #
 import agent = bbot%exe{bbot-agent}
 
-./: test{testscript} file{btrfs-*} $agent
+./: testscript file{btrfs-*} $agent
 dir{./}: test = $agent
diff --git a/tests/integration/buildfile b/tests/integration/buildfile
index 2f33955..47d3534 100644
--- a/tests/integration/buildfile
+++ b/tests/integration/buildfile
@@ -7,5 +7,5 @@
 import agent  = bbot%exe{bbot-agent}
 import worker = bbot%exe{bbot-worker}
 
-./: test{testscript} file{tftp-map} $agent $worker
+./: testscript file{tftp-map} $agent $worker
 dir{./}: test = $agent
diff --git a/tests/machine/buildfile b/tests/machine/buildfile
index fb532fc..e96d0c5 100644
--- a/tests/machine/buildfile
+++ b/tests/machine/buildfile
@@ -6,5 +6,5 @@
 #
 import agent = bbot%exe{bbot-agent}
 
-./: test{testscript} $agent
+./: testscript $agent
 dir{./}: test = $agent
diff --git a/unit-tests/bootstrap-manifest/buildfile b/unit-tests/bootstrap-manifest/buildfile
index c628833..41b3c79 100644
--- a/unit-tests/bootstrap-manifest/buildfile
+++ b/unit-tests/bootstrap-manifest/buildfile
@@ -3,4 +3,4 @@
 # license   : TBC; see accompanying LICENSE file
 
 include ../../bbot/
-exe{driver}: {hxx cxx}{*} ../../bbot/libu{bbot} test{testscript}
+exe{driver}: {hxx cxx}{*} ../../bbot/libu{bbot} testscript
diff --git a/unit-tests/machine-manifest/buildfile b/unit-tests/machine-manifest/buildfile
index 6d47d77..d71de87 100644
--- a/unit-tests/machine-manifest/buildfile
+++ b/unit-tests/machine-manifest/buildfile
@@ -3,4 +3,4 @@
 # license   : TBC; see accompanying LICENSE file
 
 include ../../bbot/
-exe{driver}: {hxx cxx}{*} ../../bbot/libu{bbot} test{testscript}
+exe{driver}: {hxx cxx}{*} ../../bbot/libu{bbot} testscript
-- 
cgit v1.1