diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2016-08-31 19:23:32 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2016-08-31 19:23:32 +0300 |
| commit | 5f3c97306cda519e7edf41142ee903d22320c84a (patch) | |
| tree | 93b530e4e5f8fd80d24326ea0521a47eaabe7581 | |
| parent | c711529fc2e807051af031ae7a26d3c293ff8ca7 (diff) | |
Build infrastructure update
| -rw-r--r-- | build/bootstrap.build | 20 | ||||
| -rw-r--r-- | build/root.build | 5 | ||||
| -rw-r--r-- | manifest | 2 | ||||
| -rw-r--r-- | odb/buildfile | 8 | ||||
| -rw-r--r-- | tests/build/.gitignore | 1 | ||||
| -rw-r--r-- | tests/build/root.build | 5 |
6 files changed, 33 insertions, 8 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build index c3dea80..9c976a4 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -3,16 +3,24 @@ # license : GNU GPL v2; see accompanying LICENSE file project = libodb -version = 2.5.0-a10 -revision = 0 using build@0.4.0-a1 -using config -using dist -using test -using install + +version = 2.5.0-a10 + +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 config +using dist +using test +using install diff --git a/build/root.build b/build/root.build index fb0de84..74af848 100644 --- a/build/root.build +++ b/build/root.build @@ -5,3 +5,8 @@ cxx.std = 11 using cxx + +hxx{*}: extension = hxx +ixx{*}: extension = ixx +txx{*}: extension = txx +cxx{*}: extension = cxx @@ -10,4 +10,4 @@ changes-file: NEWS url: http://www.codesynthesis.com/products/odb/ email: odb-users@codesynthesis.com requires: c++11 -requires: build2 >= 0.4.0-a1 +requires: build2 >= 0.4.0 diff --git a/odb/buildfile b/odb/buildfile index 7bbf495..aae2bf9 100644 --- a/odb/buildfile +++ b/odb/buildfile @@ -92,6 +92,14 @@ details/shared-ptr/{hxx }{ counter-type } \ details/shared-ptr/{hxx }{ exception } \ details/win32/{hxx }{ windows } +# 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}: bin.lib.version = @-$version +else + lib{odb}: bin.lib.version = @-$abi_major.$abi_minor + cxx.poptions =+ -I$src_root -DLIBODB_BUILD2 obja{*}: cxx.poptions += -DLIBODB_STATIC_BUILD objs{*}: cxx.poptions += -DLIBODB_SHARED_BUILD diff --git a/tests/build/.gitignore b/tests/build/.gitignore new file mode 100644 index 0000000..225c27f --- /dev/null +++ b/tests/build/.gitignore @@ -0,0 +1 @@ +config.build diff --git a/tests/build/root.build b/tests/build/root.build index 9d11dd5..5dd8142 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -2,9 +2,12 @@ # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file +cxx.std = 11 + using cxx -cxx.std = 11 +hxx{*}: extension = hxx +cxx{*}: extension = cxx # Every exe{} in this subproject is by default a test. # |