Get rid of doc{version} and types for testscript and manifest in buildfiles

4 files changed, 3 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index d88d707..6463c36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,3 @@
 # Generated .gitignore files.
 #
 .gitignore
-
-# Generated version.
-#
-version
diff --git a/buildfile b/buildfile
index 10727cf..96d0c16 100644
--- a/buildfile
+++ b/buildfile
@@ -2,15 +2,7 @@
 # copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 # 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 examples, tests or the INSTALL file.
 #
diff --git a/libstudxml/buildfile b/libstudxml/buildfile
index a46ddea..f44c426 100644
--- a/libstudxml/buildfile
+++ b/libstudxml/buildfile
@@ -27,7 +27,7 @@ lib{studxml}: details/genx/{h{*} c{*} doc{LICENSE README}}
 # 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/roundtrip/buildfile b/tests/roundtrip/buildfile
index 14fd49a..29cf618 100644
--- a/tests/roundtrip/buildfile
+++ b/tests/roundtrip/buildfile
@@ -4,7 +4,7 @@
 
 import libs = libstudxml%lib{studxml}
 
-exe{driver}: {hxx cxx}{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs testscript
 
 define xml: file
 xml{*}: extension = xml