summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-05-19 14:46:56 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2018-05-19 14:46:56 (GMT)
commit469879f6160bc80fdd7dbedb577c7741adf2be4b (patch)
treec301a4cfccb49256bc9a9f1e1971b280c2c5ba42
parent0a83358c046a2c83d07fc87ac23708a4f9032167 (diff)
Get rid of doc{version} and types for testscript and manifest in buildfiles
-rw-r--r--.gitignore4
-rw-r--r--buildfile10
-rw-r--r--libpq/buildfile2
-rw-r--r--tests/conninfo/buildfile2
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 edf5e7f..5374b96 100644
--- a/buildfile
+++ b/buildfile
@@ -2,15 +2,7 @@
# copyright : Copyright (c) 2016-2017 Code Synthesis Ltd
# license : PostgreSQL License; see accompanying COPYRIGHT file
-./: {*/ -build/} doc{COPYRIGHT 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{COPYRIGHT INSTALL README} manifest
# Don't install tests or the INSTALL file.
#
diff --git a/libpq/buildfile b/libpq/buildfile
index 87000d9..6555bad 100644
--- a/libpq/buildfile
+++ b/libpq/buildfile
@@ -37,7 +37,7 @@ else
# The version file is an internal one (it is only included from
# postgresql/pg_config.h) so we don't distribute nor install it (see below).
#
-h{version}: in{version} $src_root/file{manifest}
+h{version}: in{version} $src_root/manifest
c.poptions += -DFRONTEND -DUNSAFE_STAT_OK -DSO_MAJOR_VERSION=$abi_major
diff --git a/tests/conninfo/buildfile b/tests/conninfo/buildfile
index 3ba850b..0c0682b 100644
--- a/tests/conninfo/buildfile
+++ b/tests/conninfo/buildfile
@@ -7,7 +7,7 @@
#
import libs = libpq%lib{pq}
-exe{driver}: {h c}{* -uri-regress} $libs test{testscript} \
+exe{driver}: {h c}{* -uri-regress} $libs testscript \
file{uri-regress.c regress.in expected.out}
c.poptions =+ "-I$src_base"