From a6107af416eb1c62e55d847368ed07697229a1f6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 5 Mar 2019 12:00:30 +0300
Subject: Align with latest bdep-new

---
 bpkg/buildfile                                 |  11 +++++++++--
 tests/common/hello/libhello-1.0.0.tar.gz       | Bin 2414 -> 2426 bytes
 tests/common/libhello-1.0.0/libhello/buildfile |  21 ++++++++++++++-------
 tests/common/libhello-1.0.0/manifest           |   3 ++-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/bpkg/buildfile b/bpkg/buildfile
index b561ce6..fb98007 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -52,6 +52,8 @@ exe{bpkg}:                                                                 \
 
 hxx{version}: in{version} $src_root/manifest
 
+# Build options.
+#
 # Disable "unknown pragma" warnings.
 #
 if ($cxx.class == 'msvc')
@@ -66,6 +68,8 @@ if ($cxx.id == 'msvc' && $cxx.version.major == 19 && $cxx.version.minor < 10)
 
 obj{utility}: cxx.poptions += -DBPKG_EXE_SUFFIX='"'$bin.exe.suffix'"'
 
+# Generated options parser.
+#
 if $cli.configured
 {
   # General topics and common options.
@@ -141,6 +145,9 @@ bpkg::pkg_build_pkg_options=exclude-base --generate-modifier
   # them when cleaning in src (so that clean results in a state identical to
   # distributed).
   #
-  cli.cxx{*}: dist  = true
-  cli.cxx{*}: clean = ($src_root != $out_root)
+  cli.cxx{*}:
+  {
+    dist  = true
+    clean = ($src_root != $out_root)
+  }
 }
diff --git a/tests/common/hello/libhello-1.0.0.tar.gz b/tests/common/hello/libhello-1.0.0.tar.gz
index 281d221..34cad66 100644
Binary files a/tests/common/hello/libhello-1.0.0.tar.gz and b/tests/common/hello/libhello-1.0.0.tar.gz differ
diff --git a/tests/common/libhello-1.0.0/libhello/buildfile b/tests/common/libhello-1.0.0/libhello/buildfile
index 927c307..85e9ab5 100644
--- a/tests/common/libhello-1.0.0/libhello/buildfile
+++ b/tests/common/libhello-1.0.0/libhello/buildfile
@@ -1,21 +1,28 @@
 lib{hello}: {hxx cxx}{hello} hxx{export}
 
-# For pre-releases use the complete version to make sure they cannot be used
-# in place of another pre-release or the final version.
+# Build options.
 #
-if $version.pre_release
-  lib{hello}: bin.lib.version = @"-$version.project_id"
-else
-  lib{hello}: bin.lib.version = @"-$version.major.$version.minor"
-
 cxx.poptions += "-I$src_root"
+
 obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
 objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
 
+# Export options.
+#
 lib{hello}: cxx.export.poptions = "-I$src_root"
+
 liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC
 libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
 
+# For pre-releases use the complete version to make sure they cannot be used
+# in place of another pre-release or the final version. See the version module
+# for details on the version.* variable values.
+#
+if $version.pre_release
+  lib{hello}: bin.lib.version = @"-$version.project_id"
+else
+  lib{hello}: bin.lib.version = @"-$version.major.$version.minor"
+
 # Install into the libhello/ subdirectory of, say, /usr/include/.
 #
 {hxx ixx txx}{*}: install = include/libhello/
diff --git a/tests/common/libhello-1.0.0/manifest b/tests/common/libhello-1.0.0/manifest
index d7d43a7..1fdd50c 100644
--- a/tests/common/libhello-1.0.0/manifest
+++ b/tests/common/libhello-1.0.0/manifest
@@ -11,4 +11,5 @@ goal is to show a canonical build2/bpkg project/package.
 url: http://www.example.org/libhello
 email: hello-users@example.org
 requires: c++11
-depends: * build2 >= 0.5.0-
+depends: * build2 >= 0.9.0
+depends: * bpkg >= 0.9.0
-- 
cgit