From acb842d856514efe9c3901ebe41cd2768451c79e Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 19 May 2018 17:39:53 +0300 Subject: Get rid of doc{version} and types for testscript and manifest in buildfiles --- .gitignore | 4 ---- buildfile | 10 +--------- mysql/buildfile | 2 +- tests/basic/buildfile | 2 +- 4 files changed, 3 insertions(+), 15 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 b8ec70f..1248f47 100644 --- a/buildfile +++ b/buildfile @@ -2,15 +2,7 @@ # copyright : Copyright (c) 2016-2017 Code Synthesis Ltd # license : GPLv2 with FOSS License Exception; see accompanying COPYING file -./: {*/ -build/} doc{COPYING GPLv2 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 GPLv2 INSTALL README} manifest # Don't install tests or the INSTALL file. # diff --git a/mysql/buildfile b/mysql/buildfile index dfe788e..a4b5837 100644 --- a/mysql/buildfile +++ b/mysql/buildfile @@ -73,7 +73,7 @@ else # variables name/value hash in the dependency file? This will be fixed # as part of the in module. # -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) diff --git a/tests/basic/buildfile b/tests/basic/buildfile index 4c93d2e..bfdb3c6 100644 --- a/tests/basic/buildfile +++ b/tests/basic/buildfile @@ -4,4 +4,4 @@ import libs = libmysqlclient%lib{mysqlclient} -exe{driver}: {h c}{*} $libs test{testscript} +exe{driver}: {h c}{*} $libs testscript -- cgit v1.1