diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | bbot/.gitignore | 1 | ||||
| -rw-r--r-- | bbot/build-config | 1 | ||||
| -rw-r--r-- | bbot/buildfile | 9 | ||||
| -rw-r--r-- | bbot/manifest | 1 | ||||
| -rw-r--r-- | bbot/version | 42 | ||||
| -rw-r--r-- | bbot/version.in | 48 | ||||
| -rw-r--r-- | build/bootstrap.build | 19 | ||||
| -rw-r--r-- | buildfile | 7 | ||||
| -rw-r--r-- | manifest | 10 | ||||
| -rw-r--r-- | version | 1 |
11 files changed, 71 insertions, 72 deletions
@@ -11,3 +11,7 @@ *.exe *.exe.dlls/ *.exe.manifest + +# Generated version. +# +version diff --git a/bbot/.gitignore b/bbot/.gitignore new file mode 100644 index 0000000..088eda4 --- /dev/null +++ b/bbot/.gitignore @@ -0,0 +1 @@ +version diff --git a/bbot/build-config b/bbot/build-config index 0f92eb8..d7a07d9 100644 --- a/bbot/build-config +++ b/bbot/build-config @@ -15,6 +15,7 @@ #include <butl/target-triplet> #include <bbot/export> +#include <bbot/version> namespace bbot { diff --git a/bbot/buildfile b/bbot/buildfile index 27bde1a..0a53207 100644 --- a/bbot/buildfile +++ b/bbot/buildfile @@ -11,13 +11,16 @@ lib{bbot}: \ {hxx }{ version } \ $int_libs +hxx{version}: in{version} $src_root/file{manifest} +hxx{version}: dist = true + # For pre-releases use the complete version to make sure they cannot be used # in place of another pre-release or the final version. # -if $abi_prerelease - lib{bbot}: bin.lib.version = @-$version +if $version.pre_release + lib{bbot}: bin.lib.version = @"-$version.project_id" else - lib{bbot}: bin.lib.version = @-$abi_major.$abi_minor + lib{bbot}: bin.lib.version = @"-$version.major.$version.minor" cxx.poptions =+ "-I$src_root" obja{*}: cxx.poptions += -DLIBBBOT_STATIC_BUILD diff --git a/bbot/manifest b/bbot/manifest index b2fefdd..115d9b6 100644 --- a/bbot/manifest +++ b/bbot/manifest @@ -16,6 +16,7 @@ #include <bpkg/manifest> // version, repository_location #include <bbot/export> +#include <bbot/version> namespace bbot { diff --git a/bbot/version b/bbot/version deleted file mode 100644 index d996d8b..0000000 --- a/bbot/version +++ /dev/null @@ -1,42 +0,0 @@ -// file : bbot/version -*- C++ -*- -// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef LIBBBOT_VERSION // Note: using the version macro itself. - -#include <butl/version> // LIBBUTL_VERSION -#include <bpkg/version> // LIBBPKG_VERSION - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0-a1 02019901 -// 3.0.0-b2 02999952 -// -#define LIBBBOT_VERSION 49901 -#define LIBBBOT_VERSION_STR "0.5.0-a1" - -// Generally, we expect minor versions to be source code backwards- -// compatible, thought we might have a minimum version requirement. -// -// Note: does not apply during early development. -// -#if LIBBUTL_VERSION != 49901 -# error incompatible libbutl version -#endif - -#if LIBBPKG_VERSION != 49901 -# error incompatible libbpkg version -#endif - -#endif // LIBBBOT_VERSION diff --git a/bbot/version.in b/bbot/version.in new file mode 100644 index 0000000..41c4ce6 --- /dev/null +++ b/bbot/version.in @@ -0,0 +1,48 @@ +// file : bbot/version.in -*- C++ -*- +// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef LIBBBOT_VERSION // Note: using the version macro itself. + +// Note: using build2 standard versioning scheme. The numeric version format +// is AAABBBCCCDDDE where: +// +// AAA - major version number +// BBB - minor version number +// CCC - bugfix version number +// DDD - alpha / beta (DDD + 500) version number +// E - final (0) / snapshot (1) +// +// When DDDE is not 0, 1 is subtracted from AAABBBCCC. For example: +// +// Version AAABBBCCCDDDE +// +// 0.1.0 0000010000000 +// 0.1.2 0000010010000 +// 1.2.3 0010020030000 +// 2.2.0-a.1 0020019990010 +// 3.0.0-b.2 0029999995020 +// 2.2.0-a.1.z 0020019990011 +// +#define LIBBBOT_VERSION $libbbot.version.project_number$ULL +#define LIBBBOT_VERSION_STR "$libbbot.version.project$" +#define LIBBBOT_VERSION_ID "$libbbot.version.project_id$" + +#define LIBBBOT_VERSION_MAJOR $libbbot.version.major$ +#define LIBBBOT_VERSION_MINOR $libbbot.version.minor$ +#define LIBBBOT_VERSION_PATCH $libbbot.version.patch$ + +#define LIBBBOT_PRE_RELEASE $libbbot.version.pre_release$ + +#define LIBBBOT_SNAPSHOT $libbbot.version.snapshot_sn$ULL +#define LIBBBOT_SNAPSHOT_ID "$libbbot.version.snapshot_id$" + +#include <butl/version> + +$libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$ + +#include <bpkg/version> + +$libbpkg.check(LIBBPKG_VERSION, LIBBPKG_SNAPSHOT)$ + +#endif // LIBBBOT_VERSION diff --git a/build/bootstrap.build b/build/bootstrap.build index 924ffe0..a9e596b 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -4,25 +4,8 @@ project = libbbot -using build@0.4.0 - - -version = 0.5.0-a1 - -abi_major = 0 -abi_minor = 5 -abi_patch = 0 -abi_prerelease = true - -revision = 0 - +using version using config using dist - -dist.package = $project-$version - -if ($revision != 0) - dist.package += +$revision - using test using install @@ -2,9 +2,10 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -d = bbot/ tests/ -./: $d doc{INSTALL LICENSE NEWS README version} file{manifest} -include $d +./: bbot/ tests/ doc{INSTALL LICENSE NEWS README version} file{manifest} + +doc{version}: file{manifest} # Generated by the version module. +doc{version}: dist = true # Don't install tests or the INSTALL file. # @@ -1,6 +1,6 @@ : 1 name: libbbot -version: 0.5.0-a1 +version: 0.5.0-b.0.z summary: build2 build bot library license: MIT tags: build2, bbot, build, bot @@ -10,7 +10,7 @@ url: https://build2.org 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: libbpkg == 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) +depends: libbpkg [0.5.0-b.0.1 0.5.0-b.1) diff --git a/version b/version deleted file mode 100644 index d1f4eb1..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -0.5.0-a1 |