From ca94add8978d70b9f15b3941c59c443374ad2ffc Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 28 Apr 2017 17:28:10 +0300 Subject: Switch to version module --- .gitignore | 3 +++ build/bootstrap.build | 11 +---------- buildfile | 3 +++ manifest | 8 ++++---- version | 1 - 5 files changed, 11 insertions(+), 15 deletions(-) create mode 100644 .gitignore delete mode 100644 version diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d6021ae --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# Generated version. +# +version diff --git a/build/bootstrap.build b/build/bootstrap.build index 0c9813a..b095cc0 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -4,16 +4,7 @@ project = msvc-linux -using build@0.4.0 - -version = 0.1.0-a1 -revision = 0 - -dist.package = $project-$version - -if ($revision != 0) - dist.package += +$revision - +using version using config using dist using install diff --git a/buildfile b/buildfile index 0423ab9..e496afd 100644 --- a/buildfile +++ b/buildfile @@ -41,6 +41,9 @@ s = cl-11-32 lib-11-32 link-11-32 mt-11-32 rc-11-32 \ ./: msvc-common/exe{msvc-filter} sh{$s} \ doc{INSTALL LICENSE NEWS README version} file{manifest} +doc{version}: file{manifest} # Generated by the version module. +doc{version}: dist = true + msvc-common/: { import libs = libbutl%lib{butl} diff --git a/manifest b/manifest index d747d9b..321fa0a 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: msvc-linux # @@ Shouldn't we change it to some more generic name? -version: 0.1.0-a1 +version: 0.1.0-b.0.z summary: MS Visual C++ driver scripts license: MIT tags: msvc, vc, c++, script @@ -10,6 +10,6 @@ url: https://build2.org # @@ Use the proper url and email. email: users@build2.org build-email: builds@build2.org requires: c++14 -depends: * build2 >= 0.4.0 -depends: * bpkg >= 0.4.0 -depends: libbutl == 0.5.0-a1 +depends: * build2 >= 0.5.0- +depends: * bpkg >= 0.5.0- +depends: libbutl == [0.5.0-b.0.1 0.5.0-b.1) diff --git a/version b/version deleted file mode 100644 index 74679d2..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -0.1.0-a1 -- cgit v1.1