From 8f9a80a9ac8f353ce2cdafa23f0e5163d30d5800 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 1 May 2019 22:32:11 +0300 Subject: Add support for description-type package manifest value --- tests/load/1/math/libfoo-1.2.4+1.tar.gz | Bin 941 -> 964 bytes tests/load/1/math/packages.manifest | 7 +++++-- tests/load/1/misc/packages.manifest | 1 + tests/load/1/stable/packages.manifest | 1 + tests/load/1/stable/signature.manifest | 20 ++++++++++---------- tests/load/driver.cxx | 6 +++--- 6 files changed, 20 insertions(+), 15 deletions(-) (limited to 'tests') 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 7c6875b..29b0c55 100644 Binary files a/tests/load/1/math/libfoo-1.2.4+1.tar.gz and b/tests/load/1/math/libfoo-1.2.4+1.tar.gz differ diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest index d1c972d..1bb1c57 100644 --- a/tests/load/1/math/packages.manifest +++ b/tests/load/1/math/packages.manifest @@ -8,6 +8,7 @@ summary: The exponent license: MIT tags: mathlab, c++, exponent description: The exponent math function. +description-type: text/plain url: http://exp.example.com email: users@exp.example.com build-email: builds@exp.example.com @@ -50,10 +51,11 @@ 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 MATLAB. +similar to ~~mathlab~~ **MATLAB**. Useful for conversion of research code into production environments. \ +description-type: text/markdown changes: \ 1.2.4+1 * applied patch for critical bug-219 @@ -76,7 +78,7 @@ requires: c++11 requires: ? ; libc++ standard library if using Clang on Mac OS X. requires: ? vc++ >= 12.0; Only if using VC++ on Windows. location: libfoo-1.2.4+1.tar.gz -sha256sum: c5e593d8efdc34a258f8c0b8cc352dc7193ea4a1d666bcf8d48708c7dd82d0d6 +sha256sum: 92eb89770be390cbac9e0113763e0c10c43a4530667f5572571895617368369a : name: libpq version: 0 @@ -105,6 +107,7 @@ The packaging of PostgreSQL for build2 is tracked in a Git repository at: https://git.build2.org/cgit/packaging/postgresql/ \ +description-type: text/plain url: https://www.postgresql.org/ package-url: https://git.build2.org/cgit/packaging/postgresql/ email: pgsql-general@postgresql.org; Mailing list. diff --git a/tests/load/1/misc/packages.manifest b/tests/load/1/misc/packages.manifest index bf6efca..1f1571b 100644 --- a/tests/load/1/misc/packages.manifest +++ b/tests/load/1/misc/packages.manifest @@ -6,6 +6,7 @@ version: 2.4.0+3 priority: security; Very important to install. summary: The Bar library description: very very good library. +description-type: text/plain license: GPLv2 tags: c++, bar url: http://www.example.com/bar/ diff --git a/tests/load/1/stable/packages.manifest b/tests/load/1/stable/packages.manifest index 4c83ed5..9b9b242 100644 --- a/tests/load/1/stable/packages.manifest +++ b/tests/load/1/stable/packages.manifest @@ -54,6 +54,7 @@ summary: The Foo Library license: MIT; Permissive free software license. tags: c++, foo description: Very good foo library. +description-type: text/plain changes: some changes 1 changes: some changes 2 url: http://www.example.com/foo/ diff --git a/tests/load/1/stable/signature.manifest b/tests/load/1/stable/signature.manifest index decdf5b..861f9ea 100644 --- a/tests/load/1/stable/signature.manifest +++ b/tests/load/1/stable/signature.manifest @@ -1,13 +1,13 @@ : 1 -sha256sum: f48f71ccb83024007dedc63148d4682e7b2a478a3ca78583e3562ea4bcf396a5 +sha256sum: 31af43bc14d0fd99c623d3801a982a195f78690f1d3fd6fff24b26af774c2ebd signature: \ -K+F80RQE97ZmEVAl2wQwyYaw/SzviqfuR7FBTdF3PtnIorCxeokwvDL0ip7PiEJRp7QF5V0T69F+ -35MqTrRm/cLdKsxk1vsG8KWMuoK3LSXj+jcPkxKGmVoI09MvPxIQNgHKe/gk1f7uBExnpeOdfHyV -2zP6GMOhZIY4SScNeFr5lo/4bpEEtLNH1TbiYHaaGlBQDmzGzY+kdCrzZ/nWEBaWIHdT8GcqQF1D -P+KWYFoOoT5DnZtfk3ohTI1YHdDQWyWq8vFqkfpRDwxqtHltGeNLjmlwxF6gPJq9H6UZMZfEHGvs -qAScoiA5ozdPt1UXiYtPXpDoweHKcoVPHyqMxcciMTx8BYXDqY8V9EKwd/F3rD0ITzXW3eaRNygo -Jh6w6tjhZjFQ+NJ9GgsxE7NNU1dYhXuzKyBwus0GkGHriGTU7L0t2MoY/1GXihexwz3fHAmkOYxe -Iz4Xt+SZeRSLa5VFFjyEOtbtvbVv8R2WngG4xwNH0b3nMJ8Baa87rajSIfIoXJaeNFWhpEBwCToz -59aJXl76+0kQL40+wSO7+/o8LnLS2sW6+ooMjM8RLRBLTzNqSsVH5kA+W0qF8e0j7AJ0qcqU5HKZ -MzhB7jPyQ82LBq/eU29bgM9hLkOiJpqwplmiRyby98jBz4ppnIytfQeD52PtDCf4yWT9p3PsKmg= +nNA9y8ce0C509b5QrMclLYQv4x9AI+WRvV0KPY6b0F1UsLUbUOgDZpF7FkwTMcqRSxHgZfn8TDi4 +VyXMJwoQZLhDNXkb+uRCiUyJr6OO/pSzzfqK2ZWYgSD3WjhHBzzqTt6xWx/hac+8D/r2h0S5khaJ +eVFA4kv7yuk20CiCkjoApGsrSICLQVXBNYecaUhdZ4+8GoHZbYZDQs+a2H+7nfxqzkMlJWC08w+7 +XZc03M6ROogspfNOjGN5k5K4WVJgrWJTl7GLzlqkwSQ2sTkr9djmZaVLwHD2qOuZNCbxaqdEs6Ju +HopyEOjgQohL3YHf09sAvU11i9bOxgWMNQNLfJ8GwTJkt5Vhn5710sNA4fjBiU0+y6eqdFbH3BDt +GhtQ+ghkhQAqVjwlzNgf2VlSlk1hK9FnryhdYPCxsmf+MNYNrdFtPFZXNORix6st8IbmtbHh2Aml +VAFpt2yHiZ0uS8uMhU6QI52WILPAnrIYCVNwqz2tGbMPJ3MKF3rnvX66zwC+2cZ5fXn/X9e4oIA1 +7cdMmph0xKig+gWU2/+LbMMIPGGZJWt53uS5JFTcTR0It7FYq02f/EefbzPH9X4QhSeeZD8sDcnu +hZaH/As7FoIA5YLpgb4VR9hJ+pNjZyyhS0ylPuhJSrK73o3RrSEoukjmT7ojuWFd732AQIM+bc4= \ diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index 82a1447..27be0da 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -683,8 +683,8 @@ test_pkg_repos (const cstrings& loader_args, "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 " - "MATLAB.\n\nUseful for conversion of research code into " - "production environments."); + "~~mathlab~~ **MATLAB**.\n\nUseful for conversion of research " + "code into production environments."); assert (fpv5->url && *fpv5->url == "http://www.example.com/foo/"); @@ -782,7 +782,7 @@ test_pkg_repos (const cstrings& loader_args, assert (check_location (fpv5)); assert (fpv5->sha256sum && *fpv5->sha256sum == - "c5e593d8efdc34a258f8c0b8cc352dc7193ea4a1d666bcf8d48708c7dd82d0d6"); + "92eb89770be390cbac9e0113763e0c10c43a4530667f5572571895617368369a"); // Verify libexp package version. // -- cgit v1.1