From 4bbb90782628d40cd52e03e078611ad38cd74936 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 22 Apr 2020 12:50:14 +0200
Subject: Update metadata protocol

---
 cli/cli/cli.cxx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'cli/cli/cli.cxx')

diff --git a/cli/cli/cli.cxx b/cli/cli/cli.cxx
index c57caee..6c51aae 100644
--- a/cli/cli/cli.cxx
+++ b/cli/cli/cli.cxx
@@ -34,13 +34,17 @@ main (int argc, char* argv[])
 
     // Handle --build2-metadata (see also buildfile).
     //
-    if (ops.build2_metadata ())
+    if (ops.build2_metadata_specified ())
     {
       ostream& o (cout);
 
+      // Note that the export.metadata variable should be the first non-
+      // blank/comment line.
+      //
       o << "# build2 buildfile cli" << endl
-        << "cli.version = '" << CLI_VERSION_ID << '\'' << endl
-        << "cli.checksum = '" << CLI_CHECKSUM << '\'' << endl;
+        << "export.metadata = 1" << endl
+        << "cli.version = [string] '" << CLI_VERSION_FULL << '\'' << endl
+        << "cli.checksum = [string] '" << CLI_VERSION_FULL << '\'' << endl;
 
       return 0;
     }
-- 
cgit v1.1