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

---
 .gitignore                  |  4 ----
 buildfile                   | 10 +---------
 cli/buildfile               |  2 +-
 tests/combined/buildfile    |  2 +-
 tests/file/buildfile        |  2 +-
 tests/group/buildfile       |  2 +-
 tests/headings/buildfile    |  2 +-
 tests/note/buildfile        |  2 +-
 tests/toc/buildfile         |  2 +-
 unit-tests/lexer/buildfile  |  2 +-
 unit-tests/parser/buildfile |  2 +-
 11 files changed, 10 insertions(+), 22 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 d664cc3..712b2f5 100644
--- a/buildfile
+++ b/buildfile
@@ -21,15 +21,7 @@ d = cli/ unit-tests/
 if $cli.configured
   d += tests/ examples/
 
-./: $d 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)
+./: $d doc{INSTALL LICENSE NEWS README} manifest
 
 # Don't install examples, tests or the INSTALL file.
 #
diff --git a/cli/buildfile b/cli/buildfile
index 7e302c8..669731d 100644
--- a/cli/buildfile
+++ b/cli/buildfile
@@ -10,7 +10,7 @@ libu{cli}: {hxx ixx txx cxx}{** -cli -version -options} \
            {hxx}{version} {hxx ixx cxx}{options}        \
            $libs
 
-hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: in{version} $src_root/manifest
 
 # Generated options parser.
 #
diff --git a/tests/combined/buildfile b/tests/combined/buildfile
index a94bbb0..19b14aa 100644
--- a/tests/combined/buildfile
+++ b/tests/combined/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: {hxx cxx}{* -test} cli.cxx{test} test{testscript}
+exe{driver}: {hxx cxx}{* -test} cli.cxx{test} testscript
 
 cxx.poptions =+ "-I$out_base"
 
diff --git a/tests/file/buildfile b/tests/file/buildfile
index 9e5dfa0..5bcbd48 100644
--- a/tests/file/buildfile
+++ b/tests/file/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: {hxx cxx}{* -test} cli.cxx{test} test{testscript}
+exe{driver}: {hxx cxx}{* -test} cli.cxx{test} testscript
 
 cxx.poptions =+ "-I$out_base"
 
diff --git a/tests/group/buildfile b/tests/group/buildfile
index c28920f..3e09fa1 100644
--- a/tests/group/buildfile
+++ b/tests/group/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: {hxx cxx}{* -test} cli.cxx{test} test{testscript}
+exe{driver}: {hxx cxx}{* -test} cli.cxx{test} testscript
 
 cxx.poptions =+ "-I$out_base"
 
diff --git a/tests/headings/buildfile b/tests/headings/buildfile
index ee49fb2..a2ccdbd 100644
--- a/tests/headings/buildfile
+++ b/tests/headings/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript}
+./: testscript
diff --git a/tests/note/buildfile b/tests/note/buildfile
index 2051ed0..a363bc2 100644
--- a/tests/note/buildfile
+++ b/tests/note/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript}
+./: testscript
diff --git a/tests/toc/buildfile b/tests/toc/buildfile
index 849c997..f319c14 100644
--- a/tests/toc/buildfile
+++ b/tests/toc/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript}
+./: testscript
diff --git a/unit-tests/lexer/buildfile b/unit-tests/lexer/buildfile
index 3827d04..8a9c1f8 100644
--- a/unit-tests/lexer/buildfile
+++ b/unit-tests/lexer/buildfile
@@ -3,4 +3,4 @@
 # license   : MIT; see accompanying LICENSE file
 
 include ../../cli/
-exe{driver}: {hxx cxx}{*} ../../cli/libu{cli} test{testscript}
+exe{driver}: {hxx cxx}{*} ../../cli/libu{cli} testscript
diff --git a/unit-tests/parser/buildfile b/unit-tests/parser/buildfile
index 381f56a..756ecc7 100644
--- a/unit-tests/parser/buildfile
+++ b/unit-tests/parser/buildfile
@@ -3,4 +3,4 @@
 # license   : MIT; see accompanying LICENSE file
 
 include ../../cli/
-exe{driver}: {hxx cxx}{*} ../../cli/libu{cli} test{testscript}
+exe{driver}: {hxx cxx}{*} ../../cli/libu{cli} testscript
-- 
cgit v1.1