From d163a55e577ae32f013e21a395cb16865f904de5 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 28 Apr 2017 15:28:58 +0200 Subject: Switch to version module --- .gitignore | 1 + build/bootstrap.build | 11 +---------- buildfile | 6 +++++- manifest | 4 ++-- version | 1 - 5 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 version diff --git a/.gitignore b/.gitignore index 2a1dc8f..19ec793 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ *.exe.manifest hello +version diff --git a/build/bootstrap.build b/build/bootstrap.build index 34e25a2..5990cab 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -1,15 +1,6 @@ project = hello -using build@0.4.0 - -version = 1.0.0 -revision = 0 - -dist.package = $project-$version - -if ($revision != 0) - dist.package += +$revision - +using version using config using dist using test diff --git a/buildfile b/buildfile index 0f35aef..95ac13d 100644 --- a/buildfile +++ b/buildfile @@ -1,7 +1,11 @@ import libs = libhello%lib{hello} +./: exe{hello} doc{version} file{manifest} + +doc{version}: file{manifest} # Generated by the version module. +doc{version}: dist = true + exe{hello}: cxx{hello} $libs exe{hello}: test.arguments = World "Planet #345732" exe{hello}: test.output = test.out -./: exe{hello} doc{version} file{manifest} diff --git a/manifest b/manifest index 2b16d25..fb0a6d7 100644 --- a/manifest +++ b/manifest @@ -13,6 +13,6 @@ url: http://www.example.org/hello email: hello-users@example.org build-email: builds@build2.org requires: c++11 -depends: * build2 >= 0.4.0 -depends: * bpkg >= 0.4.0 +depends: * build2 >= 0.5.0- +depends: * bpkg >= 0.5.0- depends: libhello [1.0.0 2.0.0-); compatible with libhello-1.X.Y diff --git a/version b/version deleted file mode 100644 index 3eefcb9..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -1.0.0 -- cgit v1.1