aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--bpkg/buildfile2
-rw-r--r--buildfile10
-rw-r--r--tests/common/hello/libhello-1.0.0.tar.gzbin2445 -> 2412 bytes
-rw-r--r--tests/common/libhello-1.0.0/buildfile5
-rw-r--r--tests/pkg-build.test2
-rw-r--r--tests/pkg-clean.test4
7 files changed, 6 insertions, 21 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/bpkg/buildfile b/bpkg/buildfile
index 6f24025..dfe659d 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -50,7 +50,7 @@ exe{bpkg}: \
{hxx ixx cxx}{package-odb} {hxx}{version} \
$libs xml{*}
-hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: in{version} $src_root/manifest
# Disable "unknown pragma" warnings.
#
diff --git a/buildfile b/buildfile
index 2a5ec7a..fae51a6 100644
--- a/buildfile
+++ b/buildfile
@@ -2,15 +2,7 @@
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# 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 tests or the INSTALL file.
#
diff --git a/tests/common/hello/libhello-1.0.0.tar.gz b/tests/common/hello/libhello-1.0.0.tar.gz
index 24d661a..18ddb08 100644
--- a/tests/common/hello/libhello-1.0.0.tar.gz
+++ b/tests/common/hello/libhello-1.0.0.tar.gz
Binary files differ
diff --git a/tests/common/libhello-1.0.0/buildfile b/tests/common/libhello-1.0.0/buildfile
index b3ad7e3..8a79aa1 100644
--- a/tests/common/libhello-1.0.0/buildfile
+++ b/tests/common/libhello-1.0.0/buildfile
@@ -1,7 +1,4 @@
-./: libhello/ tests/ doc{INSTALL version} file{manifest}
-
-doc{version}: file{manifest} # Generated by the version module.
-doc{version}: dist = true
+./: libhello/ tests/ doc{INSTALL} manifest
# Don't install tests or the INSTALL file.
#
diff --git a/tests/pkg-build.test b/tests/pkg-build.test
index 9c9aee9..a44b45a 100644
--- a/tests/pkg-build.test
+++ b/tests/pkg-build.test
@@ -3220,7 +3220,7 @@ rep_fetch += -d cfg --auth all --trust-yes 2>!
+$build 'dist(../../libhello/@./out/)' \
"config.cxx=$config.cxx" config.dist.root=./ \
config.dist.archives=tar.gz 2>! \
- &out/*** &libhello-1.0.1/*** &libhello-1.0.1.tar.gz
+ &libhello-1.0.1/*** &libhello-1.0.1.tar.gz
: arg
:
diff --git a/tests/pkg-clean.test b/tests/pkg-clean.test
index a76c1e6..80b077b 100644
--- a/tests/pkg-clean.test
+++ b/tests/pkg-clean.test
@@ -100,7 +100,7 @@ $* 2>>EOE != 0
$pkg_configure libhello && $pkg_update libhello;
$* libhello 2>>~%EOE%;
- %.{7}
+ %.{6}
cleaned libhello/1.0.0
EOE
@@ -122,7 +122,7 @@ $* 2>>EOE != 0
$pkg_configure libhello && $pkg_update libhello;
$* libhello 2>>~%EOE%;
- %.{9}
+ %.{8}
cleaned libhello/1.0.0
EOE