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

---
 .gitignore               |  4 ----
 buildfile                | 10 +---------
 libbpkg/buildfile        |  2 +-
 tests/manifest/buildfile |  2 +-
 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/libbpkg/buildfile b/libbpkg/buildfile
index 7560620..e7a786b 100644
--- a/libbpkg/buildfile
+++ b/libbpkg/buildfile
@@ -10,7 +10,7 @@ lib{bpkg}: {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/manifest/buildfile b/tests/manifest/buildfile
index b7314ed..3d4e359 100644
--- a/tests/manifest/buildfile
+++ b/tests/manifest/buildfile
@@ -5,4 +5,4 @@
 import libs  = libbutl%lib{butl}
 import libs += libbpkg%lib{bpkg}
 
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
-- 
cgit v1.1