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

---
 .gitignore            |  4 ----
 buildfile             | 10 +---------
 mysql/buildfile       | 10 +++++-----
 tests/basic/buildfile |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3dd23c1..19c7b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,3 @@
 *.exe.dlls/
 *.exe.manifest
 *.pc
-
-# Generated version.
-#
-version
diff --git a/buildfile b/buildfile
index 9f21b3e..d5c72c5 100644
--- a/buildfile
+++ b/buildfile
@@ -2,15 +2,7 @@
 # copyright : Copyright (c) 2016-2017 Code Synthesis Ltd
 # license   : LGPLv2.1; see accompanying COPYING file
 
-./: {*/ -build/} doc{COPYING INSTALL 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{COPYING INSTALL README} manifest
 
 # Don't install tests or the INSTALL file.
 #
diff --git a/mysql/buildfile b/mysql/buildfile
index 3352b76..8116ecb 100644
--- a/mysql/buildfile
+++ b/mysql/buildfile
@@ -68,7 +68,7 @@ else
 #    Fedora/RHEL:    /var/lib/mysql/mysql.sock
 #    Source package: /tmp/mysql.sock
 #
-h{version}: in{version} $src_root/file{manifest}
+h{version}: in{version} $src_root/manifest
 
 h{version}: dist  = true
 h{version}: clean = ($src_root != $out_root)
@@ -95,11 +95,11 @@ h{version}: default_charset = ''
 h{version}: CC_SOURCE_REVISION = ''
 
 # @@ Here we generate files from the templates using the version file
-#    generating machinery (this is why the redundant $src_root/file{manifest}
+#    generating machinery (this is why the redundant $src_root/manifest
 #    prerequisite).
 #
 libmariadb/c{ma_client_plugin}: libmariadb/in{ma_client_plugin} \
-                                $src_root/file{manifest} # @@ TMP
+                                $src_root/manifest # @@ TMP
 libmariadb/c{ma_client_plugin}: in.symbol = '@'
 libmariadb/c{ma_client_plugin}: in.substitution = lax
 libmariadb/c{ma_client_plugin}: EXTERNAL_PLUGINS = ''
@@ -117,8 +117,8 @@ extern struct st_mysql_client_plugin $(p)_plugin;"
 
 if ($tclass == 'windows')
 {
-  libmariadb/def{mariadbclient}: libmariadb/in{mariadbclient_win32}           \
-                                 $src_root/file{manifest} # @@ TMP
+  libmariadb/def{mariadbclient}: libmariadb/in{mariadbclient_win32} \
+                                 $src_root/manifest # @@ TMP
   libmariadb/def{mariadbclient}: mariadb_deinitialize_ssl =                   \
                                  ($with_ssl ? 'mariadb_deinitialize_ssl' : '')
 }
diff --git a/tests/basic/buildfile b/tests/basic/buildfile
index 5f6854e..25c4fe2 100644
--- a/tests/basic/buildfile
+++ b/tests/basic/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libmariadb%lib{mariadb}
 
-exe{driver}: {h c}{*} $libs test{testscript}
+exe{driver}: {h c}{*} $libs testscript
-- 
cgit v1.1