From 00c1d66eaa276d67b2d1eda1f4dd1e854b3bfaf3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 11 Oct 2021 09:32:07 +0200
Subject: Update bin.lib.version documentation

---
 doc/manual.cli         | 20 ++++++++++----------
 libbuild2/bin/init.cxx |  3 ---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/doc/manual.cli b/doc/manual.cli
index 4f256c9..e5f1f10 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -2789,9 +2789,9 @@ libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
 # the version module for details on the version.* variable values.
 #
 if $version.pre_release
-  lib{hello}: bin.lib.version = @\"-$version.project_id\"
+  lib{hello}: bin.lib.version = \"-$version.project_id\"
 else
-  lib{hello}: bin.lib.version = @\"-$version.major.$version.minor\"
+  lib{hello}: bin.lib.version = \"-$version.major.$version.minor\"
 
 # Install into the libhello/ subdirectory of, say, /usr/include/
 # recreating subdirectories.
@@ -2989,9 +2989,9 @@ fragment:
 
 \
 if $version.pre_release
-  lib{hello}: bin.lib.version = @\"-$version.project_id\"
+  lib{hello}: bin.lib.version = \"-$version.project_id\"
 else
-  lib{hello}: bin.lib.version = @\"-$version.major.$version.minor\"
+  lib{hello}: bin.lib.version = \"-$version.major.$version.minor\"
 \
 
 Shared library versioning is a murky, platform-specific area. Instead of
@@ -3003,12 +3003,12 @@ platform-specific versions in a native format.
 The library version is specified with the \c{bin.lib.version} target-specific
 variable. Its value should be a sequence of \c{@}-pairs with the left hand
 side (key) being the platform name and the right hand side (value) being the
-version. An empty key signifies the platform-independent version (see the
-\l{#module-bin \c{bin}} module documentation for the exact semantics). For
-example:
+version. An empty key (in which case \c{@} can be omitted) signifies the
+platform-independent version (see the \l{#module-bin \c{bin}} module
+documentation for the exact semantics). For example:
 
 \
-lib{hello}: bin.lib.version = @-1.2 linux@3
+lib{hello}: bin.lib.version = -1.2 linux@3
 \
 
 \N{While the interface for platform-specific versions is defined, their
@@ -3030,9 +3030,9 @@ With this background we can now explain what's going in our \c{buildfile}:
 
 \
 if $version.pre_release
-  lib{hello}: bin.lib.version = @\"-$version.project_id\"
+  lib{hello}: bin.lib.version = \"-$version.project_id\"
 else
-  lib{hello}: bin.lib.version = @\"-$version.major.$version.minor\"
+  lib{hello}: bin.lib.version = \"-$version.major.$version.minor\"
 \
 
 Here we only use platform-independent library versioning. For releases we
diff --git a/libbuild2/bin/init.cxx b/libbuild2/bin/init.cxx
index 02321c2..ab3980a 100644
--- a/libbuild2/bin/init.cxx
+++ b/libbuild2/bin/init.cxx
@@ -144,9 +144,6 @@ namespace build2
       vp.insert<string> ("bin.lib.load_suffix");
       vp.insert<string> ("bin.lib.load_suffix_pattern");
 
-      // @@ TMP: update bdep-new generated projects, documentation not to use
-      //         @ for platform-independent version.
-      //
       vp.insert<map<optional<string>, string>> ("bin.lib.version");
       vp.insert<string>                        ("bin.lib.version_pattern");
 
-- 
cgit v1.1