From 0402b3cec89ac542dda93ac592ff21274f18de1f Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 31 Aug 2016 02:20:45 +0300
Subject: Build infrastructure update

---
 bpkg/buildfile        | 12 ++++++++++--
 build/bootstrap.build | 18 +++++++++++++++---
 build/root.build      |  3 +--
 buildfile             |  4 +++-
 manifest              |  4 ++--
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/bpkg/buildfile b/bpkg/buildfile
index 0b45ea5..6d4e09e 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -12,16 +12,24 @@ lib{bpkg}:                               \
 {hxx            }{ version             } \
                    $int_libs
 
+# 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{bpkg}: bin.lib.version = @-$version
+else
+  lib{bpkg}: bin.lib.version = @-$abi_major.$abi_minor
+
 cxx.poptions =+ -I$src_root
 obja{*}: cxx.poptions += -DLIBBPKG_STATIC_BUILD
 objs{*}: cxx.poptions += -DLIBBPKG_SHARED_BUILD
 
 lib{bpkg}: cxx.export.poptions = -I$src_root
-lib{bpkg}: cxx.export.libs = $int_libs
-
 liba{bpkg}: cxx.export.poptions += -DLIBBPKG_STATIC
 libs{bpkg}: cxx.export.poptions += -DLIBBPKG_SHARED
 
+lib{bpkg}: cxx.export.libs = $int_libs
+
 # Install into the bpkg/ subdirectory of, say, /usr/include/.
 #
 install.include = $install.include/bpkg/
diff --git a/build/bootstrap.build b/build/bootstrap.build
index f6dac48..8acb78f 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -3,12 +3,24 @@
 # license   : MIT; see accompanying LICENSE file
 
 project = libbpkg
+
+using build@0.4.0-a1
+
 version = 0.4.0-a1
 
-using build@0.3.0
+abi_major = 0
+abi_minor = 4
+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
-
-dist.package = $project-$version
diff --git a/build/root.build b/build/root.build
index 8550239..2ace472 100644
--- a/build/root.build
+++ b/build/root.build
@@ -11,7 +11,6 @@ ixx{*}: extension = ixx
 txx{*}: extension = txx
 cxx{*}: extension = cxx
 
-# All exe{} in tests/ are, well, tests. Don't install them.
+# All exe{} in tests/ are, well, tests.
 #
 tests/exe{*}: test = true
-tests/: install = false
diff --git a/buildfile b/buildfile
index a75d807..11a874e 100644
--- a/buildfile
+++ b/buildfile
@@ -6,4 +6,6 @@ d = bpkg/ tests/
 ./: $d doc{LICENSE NEWS README version} file{manifest}
 include $d
 
-doc{INSTALL*}: install = false
+# Don't install tests.
+#
+dir{tests/}: install = false
diff --git a/manifest b/manifest
index 424b774..7fe4d41 100644
--- a/manifest
+++ b/manifest
@@ -8,6 +8,6 @@ description-file: README
 changes-file: NEWS
 url: https://build2.org
 email: users@build2.org
-requires: c++11
-requires: build2 >= 0.3.0
+requires: c++14
+requires: build2 >= 0.4.0
 depends: libbutl == 0.4.0-a1
-- 
cgit v1.1