diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | build/bootstrap.build | 17 | ||||
| -rw-r--r-- | cutl/buildfile | 15 | ||||
| -rw-r--r-- | cutl/version.hxx.in | 40 | ||||
| -rw-r--r-- | manifest | 6 | ||||
| -rw-r--r-- | version | 2 |
6 files changed, 58 insertions, 26 deletions
@@ -29,3 +29,7 @@ # Generated .gitignore files. # .gitignore + +# Temporarily here because of auto-generated cutl/.gitignore. +# +cutl/version.hxx diff --git a/build/bootstrap.build b/build/bootstrap.build index 1f00274..ab09762 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -4,22 +4,7 @@ project = libcutl -using build@0.4.0 - -version = 1.11.0-a1 - -abi_major = 1 -abi_minor = 11 -abi_patch = 0 -abi_prerelease = true - -revision = 0 - -dist.package = $project-$version - -if ($revision != 0) - dist.package += +$revision - +using version using config using dist using test diff --git a/cutl/buildfile b/cutl/buildfile index 5e4787d..88eadd5 100644 --- a/cutl/buildfile +++ b/cutl/buildfile @@ -2,7 +2,6 @@ # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC # license : MIT; see accompanying LICENSE file - lib{cutl}: \ {hxx cxx}{ exception } \ {hxx }{ re } \ @@ -10,6 +9,7 @@ lib{cutl}: \ {hxx }{ shared-ptr } \ shared-ptr/{hxx ixx txx cxx}{ base } \ {hxx }{ static-ptr } \ + {hxx }{ version } \ compiler/{hxx txx }{ code-stream } \ compiler/{hxx txx cxx}{ context } \ compiler/{hxx ixx txx cxx}{ cxx-indenter } \ @@ -38,19 +38,22 @@ details/build2/{h }{ config-vc } \ meta/{hxx }{ remove-p } \ meta/{hxx }{ remove-v } +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{cutl}: bin.lib.version = @-$version +if $version.pre_release + lib{cutl}: bin.lib.version = @"-$version.project_id" else - lib{cutl}: bin.lib.version = @-$abi_major.$abi_minor + lib{cutl}: bin.lib.version = @"-$version.major.$version.minor" -cxx.poptions =+ "-I$src_root" -DLIBCUTL_BUILD2 +cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBCUTL_BUILD2 obja{*}: cxx.poptions += -DLIBCUTL_STATIC_BUILD objs{*}: cxx.poptions += -DLIBCUTL_SHARED_BUILD -lib{cutl}: cxx.export.poptions = "-I$src_root" -DLIBCUTL_BUILD2 +lib{cutl}: cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBCUTL_BUILD2 liba{cutl}: cxx.export.poptions += -DLIBCUTL_STATIC libs{cutl}: cxx.export.poptions += -DLIBCUTL_SHARED diff --git a/cutl/version.hxx.in b/cutl/version.hxx.in new file mode 100644 index 0000000..02e616c --- /dev/null +++ b/cutl/version.hxx.in @@ -0,0 +1,40 @@ +// file : cutl/version.hxx.in -*- C++ -*- +// copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC +// license : MIT; see accompanying LICENSE file + +#ifndef LIBCUTL_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 LIBCUTL_VERSION $libcutl.version.project_number$ULL +#define LIBCUTL_VERSION_STR "$libcutl.version.project$" +#define LIBCUTL_VERSION_ID "$libcutl.version.project_id$" + +#define LIBCUTL_VERSION_MAJOR $libcutl.version.major$ +#define LIBCUTL_VERSION_MINOR $libcutl.version.minor$ +#define LIBCUTL_VERSION_PATCH $libcutl.version.patch$ + +#define LIBCUTL_PRE_RELEASE $libcutl.version.pre_release$ + +#define LIBCUTL_SNAPSHOT $libcutl.version.snapshot_sn$ULL +#define LIBCUTL_SNAPSHOT_ID "$libcutl.version.snapshot_id$" + +#endif // LIBCUTL_VERSION @@ -1,6 +1,6 @@ : 1 name: libcutl -version: 1.11.0-a1 +version: 1.11.0-b.1.z summary: C++ utility library license: MIT tags: c++, utility @@ -10,5 +10,5 @@ url: http://www.codesynthesis.com/projects/libcutl/ email: libcutl-users@codesynthesis.com; Mailing list build-email: builds@codesynthesis.com requires: c++11 -depends: * build2 >= 0.4.0 -depends: * bpkg >= 0.4.0 +depends: * build2 >= 0.5.0- +depends: * bpkg >= 0.5.0- @@ -1 +1 @@ -1.11.0-a1 +1.11.0-b.1 |