Add support for package-description, package-description-type, and changes-type package manifest values

6 files changed, 64 insertions, 29 deletions

diff --git a/tests/load/1/math/libfoo-1.2.4+1.tar.gz b/tests/load/1/math/libfoo-1.2.4+1.tar.gz
index 2dde730..d3e7a0d 100644
--- a/tests/load/1/math/libfoo-1.2.4+1.tar.gz
+++ b/tests/load/1/math/libfoo-1.2.4+1.tar.gz
diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest
index 8e66ddf..9be4033 100644
--- a/tests/load/1/math/packages.manifest
+++ b/tests/load/1/math/packages.manifest
@@ -71,14 +71,28 @@ Useful for conversion of research code into production environments.
 [^mathlab]: MATLAB Capabilities: TODO
 \
 description-type: text/markdown
+package-description:\
+This project builds and defines the build2 package for the libfoo library.
+
+A modern C++ library with easy to use linear algebra and lot of optimization
+tools.
+
+There are over 100 functions in total with an extensive test suite. The API is
+similar to ~~mathlab~~ **MATLAB**.[^mathlab]
+
+Useful for conversion of research code into production environments.
+[^mathlab]: MATLAB Capabilities: TODO
+\
+package-description-type: text/markdown
 changes:\
-1.2.4+1
+**1.2.4+1**
  * applied patch for critical bug-219
  * regenerated documentation
 
-1.2.4
+**1.2.4**
  * test suite extended significantly
 \
+changes-type: text/markdown
 url: http://www.example.com/foo/; Project home page.
 doc-url: http://www.example.org/projects/libfoo/man.xhtml; Documentation page.
 src-url: http://scm.example.com/?p=odb/libodb.git\;a=tree; Source tree url.
@@ -126,7 +140,7 @@ config [uint64] config.libfoo.buffer ?= 1024
 
 \
 location: libfoo-1.2.4+1.tar.gz
-sha256sum: fe07978d72ab65c2ad72b0325aa56944cf093248d39edcb472a2fe5835defa3d
+sha256sum: 072386bc75b026889d2992374609a2b4fa18ee59c00f664d5bb21fb86a090671
 :
 name: libfoo-benchmarks
 version: 1.2.4
diff --git a/tests/load/1/misc/packages.manifest b/tests/load/1/misc/packages.manifest
index b019920..86620dd 100644
--- a/tests/load/1/misc/packages.manifest
+++ b/tests/load/1/misc/packages.manifest
@@ -15,6 +15,7 @@ depends: libfoo
 depends: libmath >= 2.0.0
 requires: linux | windows | macosx
 changes: some changes
+changes-type: text/plain
 location: libbar-2.4.0+3.tar.gz
 sha256sum: 70ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93
 :
diff --git a/tests/load/1/stable/packages.manifest b/tests/load/1/stable/packages.manifest
index 8d51838..f15ab90 100644
--- a/tests/load/1/stable/packages.manifest
+++ b/tests/load/1/stable/packages.manifest
@@ -75,6 +75,7 @@ description: Very good foo library.
 description-type: text/plain
 changes: some changes 1
 changes: some changes 2
+changes-type: text/plain
 url: http://www.example.com/foo/
 email: foo-users@example.com
 depends: libmisc >= 2.0.0
diff --git a/tests/load/1/stable/signature.manifest b/tests/load/1/stable/signature.manifest
index 9d3b944..bb18e13 100644
--- a/tests/load/1/stable/signature.manifest
+++ b/tests/load/1/stable/signature.manifest
@@ -1,13 +1,13 @@
 : 1
-sha256sum: 300aaa95b27809ca4bccf4b6eeb5f81701117457bd9e6018964004d4bbedbfb8
+sha256sum: defa57373e20beb8f22a391b1e97ec7f5e50469e050c2551e8522fab74f304e1
 signature:\
-kBjhtZKRx9FJmJmm+Bh8gUmvK99kQCWmA9qlyLWLfOiapvtliGn65eCh1uCbrjKWGri8SHPD1ABZ
-aYcfPE5Cg6L40FltFqYF5qliZo2V8Um3JPd56Bm1S8/yBTftojEBNS4RYBLcLLmd6Blmb9/igTAQ
-OOTep/zb3IGZuFzbiLHbfhP7VA4m7PUxV7AlZwSY8IhxzGurQWfBIpGskqkGk57mO+rQy3sq6bWH
-IzbgA4hvfkiXyXzcuDIlfcSQaIAfzClqybNaEFgkqKeoZgUkPLbZiYCGasyVCSmCE0gthgOZL7gJ
-sJU3iyQMeawCKuQhCr2wz1xhJjLdT41eQ1b4YbtKKneVKOhZDRXosw86xk0Ghi7SeNmWVa2y0UIg
-fLIU8um23Gh5Tf37C4pyWjSLVJ4TwAvUGPhxBxd1E2Khuvak/x/+vo983tEikI14InLkdt/KdVpd
-lprE9YEACNFaSJ1cwI6aX8exL4a7kku3YG65Mgg+JD5E1HGAOIfCZ/4FJxBF5Mq6cXDT0fIcVR7b
-ioAJVa9q+EdRrMXlovCCDvmFUvwggTTL1N1/8o0gZrgJW76BTZrNA+MJ2pkwlsJDrNi6JhqbcbOn
-ldZG1n5IwCEt4SvL2LV5iR/iH7iWrIPnkqJJu8rGKWWywz+mmOsl/TBpQylKKXmYLAnWA31htC4=
+f9b/Q+mBos6MwwFPIiIBqSEidqO+rMsktQ1ESWEkO48uHN+hjNCog0gp3Vf4QHj0p2KKU5Uz4exj
+8h7R3RB0F4B10/lDyHw4XlvAyP1uE+YS76rEXHXuGBEnGvBK9818WkCJ5yfFJYg3AuGt2Cyd3QHF
+Uxv+fDkI05KrZNGzLo9euDr6yhHOMTjwSntu/lt6ytfyzTFHcs0xOM03qEtszD5QrNdC32z7kmDE
+8ISUlMUyqOjsz8h25F04NyiojccGTpfUTgqA2zXqMAwRn+fG9wU5Vwnau/oIcAO+nUruR4i1VrDd
+D5q/gjbOpcBTt7bmbVInR5glbgdPZ7r7gpqfOVwybxeTrArj72jA/XmmYyZlaTTW1RXcJuRIWAcP
+2Z61O+cwP9CqW8ktQDNGkgDxxXJR7aEG64G8q7uZeb6v1FaQCwo2JEe/Tv0JDp+DBVKwBm7ZDZi/
+TVtltbADgISCU8bTVz/r4Q0qwHeiQo2GV+Di4h7KvWS8H2Q7sjpyWrI3/UzujOp+zB/BP+6dNZTr
+6Mf8CJ+9L5YY4lzX9jeVQLOuKOqLLZWD2VQiyaYZp79X5OtSHuNvCWcaWUa9Rpu/goLCPrk6QHD+
+wUTYcIdsEbX2jDN3YQwe53WklytPbMxy7taRF1obpGOpDDju3InD3IRXS7ch4G9XzqtsylzMIeE=
 \
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index ae3d03d..f61ab25 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -57,7 +57,7 @@ check_external (const package& p)
          !p.internal ()                   &&
          p.other_repositories.size () > 0 &&
          p.priority == priority ()        &&
-         p.changes.empty ()               &&
+         !p.changes                       &&
          p.license_alternatives.empty ()  &&
          p.dependencies.empty ()          &&
          p.requirements.empty ()          &&
@@ -384,7 +384,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpvxy->other_repositories.empty ());
 
     assert (fpvxy->priority == priority::low);
-    assert (fpvxy->changes.empty ());
+    assert (!fpvxy->changes);
 
     assert (fpvxy->license_alternatives.size () == 1);
     assert (fpvxy->license_alternatives[0].size () == 1);
@@ -420,7 +420,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv1->other_repositories[1].load () == cr);
 
     assert (fpv1->priority == priority::low);
-    assert (fpv1->changes.empty ());
+    assert (!fpv1->changes);
 
     assert (fpv1->license_alternatives.size () == 1);
     assert (fpv1->license_alternatives[0].size () == 1);
@@ -454,7 +454,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv2->internal_repository.load () == sr);
     assert (fpv2->other_repositories.empty ());
     assert (fpv2->priority == priority::low);
-    assert (fpv2->changes.empty ());
+    assert (!fpv2->changes);
 
     assert (fpv2->license_alternatives.size () == 1);
     assert (fpv2->license_alternatives[0].size () == 1);
@@ -500,7 +500,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv2a->internal_repository.load () == sr);
     assert (fpv2a->other_repositories.empty ());
     assert (fpv2a->priority == priority::security);
-    assert (fpv2a->changes.empty ());
+    assert (!fpv2a->changes);
 
     assert (fpv2a->license_alternatives.size () == 1);
     assert (fpv2a->license_alternatives[0].size () == 1);
@@ -563,7 +563,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv3->other_repositories.empty ());
     assert (fpv3->priority == priority::medium);
 
-    assert (fpv3->changes.empty ());
+    assert (!fpv3->changes);
 
     assert (fpv3->license_alternatives.size () == 1);
     assert (fpv3->license_alternatives[0].size () == 1);
@@ -591,7 +591,7 @@ test_pkg_repos (const cstrings& loader_args,
 
     assert (fpv4->summary == "The Foo Library");
     assert (fpv4->keywords == labels ({"c++", "foo"}));
-    assert (*fpv4->description == "Very good foo library.");
+    assert (fpv4->description->text == "Very good foo library.");
     assert (fpv4->url && fpv4->url->string () == "http://www.example.com/foo/");
     assert (!fpv4->package_url);
     assert (fpv4->email && *fpv4->email == "foo-users@example.com");
@@ -600,7 +600,10 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv4->internal_repository.load () == sr);
     assert (fpv4->other_repositories.empty ());
     assert (fpv4->priority == priority::low);
-    assert (fpv4->changes == "some changes 1\n\nsome changes 2");
+
+    assert (fpv4->changes &&
+            fpv4->changes->text == "some changes 1\n\nsome changes 2" &&
+            fpv4->changes->type == text_type::plain);
 
     assert (fpv4->license_alternatives.size () == 1);
     assert (fpv4->license_alternatives[0].comment ==
@@ -686,7 +689,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (xpv->internal_repository.load () == mr);
     assert (xpv->other_repositories.empty ());
     assert (xpv->priority == priority::low);
-    assert (xpv->changes.empty ());
+    assert (!xpv->changes);
 
     assert (xpv->license_alternatives.size () == 1);
     assert (xpv->license_alternatives[0].size () == 1);
@@ -724,7 +727,19 @@ test_pkg_repos (const cstrings& loader_args,
             labels ({"math library", "math API", "libbaz fork"}));
     assert (fpv5->keywords == labels ({"c++", "foo", "math", "best"}));
 
-    assert (*fpv5->description ==
+    assert (fpv5->description->text ==
+            "A modern C++ library with easy to use linear algebra and lot "
+            "of optimization\ntools.\n\nThere are over 100 functions in "
+            "total with an extensive test suite. The API is\nsimilar to "
+            "~~mathlab~~ **MATLAB**.[^mathlab]\n\nUseful for conversion of "
+            "research code into production environments.\n"
+            "[^mathlab]: MATLAB Capabilities: TODO");
+
+    assert (fpv5->description->type == text_type::github_mark);
+
+    assert (fpv5->package_description->text ==
+            "This project builds and defines the build2 package for the "
+            "libfoo library.\n\n"
             "A modern C++ library with easy to use linear algebra and lot "
             "of optimization\ntools.\n\nThere are over 100 functions in "
             "total with an extensive test suite. The API is\nsimilar to "
@@ -732,6 +747,8 @@ test_pkg_repos (const cstrings& loader_args,
             "research code into production environments.\n"
             "[^mathlab]: MATLAB Capabilities: TODO");
 
+    assert (fpv5->package_description->type == text_type::github_mark);
+
     assert (fpv5->url && fpv5->url->string () == "http://www.example.com/foo/");
 
     assert (fpv5->doc_url && fpv5->doc_url->string () ==
@@ -756,14 +773,16 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv5->priority.comment ==
             "Critical bug fixes, performance improvement.");
 
-    const char ch[] = R"DLM(1.2.4+1
+    const char ch[] = R"DLM(**1.2.4+1**
  * applied patch for critical bug-219
  * regenerated documentation
 
-1.2.4
+**1.2.4**
  * test suite extended significantly)DLM";
 
-    assert (fpv5->changes == ch);
+    assert (fpv5->changes             &&
+            fpv5->changes->text == ch &&
+            fpv5->changes->type == text_type::github_mark);
 
     assert (fpv5->license_alternatives.size () == 2);
     assert (fpv5->license_alternatives[0].comment ==
@@ -843,7 +862,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv5));
 
     assert (fpv5->sha256sum && *fpv5->sha256sum ==
-            "fe07978d72ab65c2ad72b0325aa56944cf093248d39edcb472a2fe5835defa3d");
+            "072386bc75b026889d2992374609a2b4fa18ee59c00f664d5bb21fb86a090671");
 
     assert (fpv5->buildable);
 
@@ -859,7 +878,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (epv->project == "mathLab");
     assert (epv->summary == "The exponent");
     assert (epv->keywords == labels ({"mathlab", "c++", "exponent"}));
-    assert (epv->description && *epv->description ==
+    assert (epv->description && epv->description->text ==
             "The exponent math function.");
     assert (epv->url && epv->url->string () == "http://exp.example.com");
     assert (!epv->package_url);
@@ -870,7 +889,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (epv->internal_repository.load () == mr);
     assert (epv->other_repositories.empty ());
     assert (epv->priority == priority (priority::low));
-    assert (epv->changes.empty ());
+    assert (!epv->changes);
 
     assert (epv->license_alternatives.size () == 1);
     assert (epv->license_alternatives[0].size () == 1);