diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-28 16:17:22 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-28 16:17:22 +0200 |
| commit | d012b5ee971668b68bc9161784f340bb547c7427 (patch) | |
| tree | 369f631c525d048ec33567c88e7a92278b224feb | |
| parent | 9874780f84ed6c19a7a0a7e7f266c873c64e7ced (diff) | |
Bump version to 2.5.0.b.1.z, switch to build2 version module
| -rw-r--r-- | build/bootstrap.build | 17 | ||||
| -rw-r--r-- | manifest | 8 | ||||
| -rw-r--r-- | odb/sqlite/buildfile | 6 | ||||
| -rw-r--r-- | odb/sqlite/version.hxx | 6 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 12 insertions, 27 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build index e622c90..59ec5b8 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -4,22 +4,7 @@ project = libodb-sqlite -using build@0.4.0 - -version = 2.5.0-a11 - -abi_major = 2 -abi_minor = 5 -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 @@ -1,6 +1,6 @@ : 1 name: libodb-sqlite -version: 2.5.0-a11 +version: 2.5.0-b.1.z summary: SQLite ODB runtime library license: GPLv2 license: proprietary @@ -11,7 +11,7 @@ url: http://www.codesynthesis.com/products/odb/ email: odb-users@codesynthesis.com build-email: odb-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- depends: libsqlite3 >= 3.6.18 -depends: libodb == 2.5.0-a11 +depends: libodb [2.5.0.b.1.1 2.5.0.b.2) diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile index 02c3238..293992e 100644 --- a/odb/sqlite/buildfile +++ b/odb/sqlite/buildfile @@ -54,10 +54,10 @@ details/build2/{h }{ config-vc } \ # 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{odb-sqlite}: bin.lib.version = @-$version +if $version.pre_release + lib{odb-sqlite}: bin.lib.version = @"-$version.project_id" else - lib{odb-sqlite}: bin.lib.version = @-$abi_major.$abi_minor + lib{odb-sqlite}: bin.lib.version = @"-$version.major.$version.minor" cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_SQLITE_BUILD2 obja{*}: cxx.poptions += -DLIBODB_SQLITE_STATIC_BUILD diff --git a/odb/sqlite/version.hxx b/odb/sqlite/version.hxx index 2b13ecd..33ca611 100644 --- a/odb/sqlite/version.hxx +++ b/odb/sqlite/version.hxx @@ -28,15 +28,15 @@ // Check that we have compatible ODB version. // -#if ODB_VERSION != 20411 +#if ODB_VERSION != 20451 # error incompatible odb interface version detected #endif // libodb-sqlite version: odb interface version plus the bugfix // version. // -#define LIBODB_SQLITE_VERSION 2049911 -#define LIBODB_SQLITE_VERSION_STR "2.5.0-a11" +#define LIBODB_SQLITE_VERSION 2049951 +#define LIBODB_SQLITE_VERSION_STR "2.5.0-b.1" #include <odb/post.hxx> @@ -1 +1 @@ -2.5.0-a11 +2.5.0-b.1 |