Add support for src-url and doc-url package manifest values

3 files changed, 13 insertions, 7 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 5210ced..20434bf 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 b/tests/load/1/math/packages
index a796d31..c49b7bd 100644
--- a/tests/load/1/math/packages
+++ b/tests/load/1/math/packages
@@ -12,8 +12,8 @@ email: users@exp.com
 build-email: builds@exp.com
 depends: libmisc
 depends: libpq >= 9.0.0
-build-include: linux*
 build-exclude: *; Only supported on Linux.
+build-include: linux*
 location: libexp-1~1.2+1.tar.gz
 sha256sum: 0a7414d06ad26d49dad203deaf3841f3df97f1fe27c5bf190c1c20dfeb7f84e0
 :
@@ -51,8 +51,10 @@ changes: \
  * test suite extended significantly
 \
 url: http://www.example.com/foo/; Project home page.
-package-url: http://www.example.com/foo/pack; Package details.
 email: foo-users@example.com; Public mailing list. Read FAQ before posting.
+doc-url: http://www.example.org/projects/libfoo/man.xhtml; documentation page
+src-url: https://git.example.org/cgit/libfoo/tree/; source tree url
+package-url: http://www.example.com/foo/pack; Package details.
 package-email: pack@example.com; Current packager.
 depends: libmisc < 1.1 | libmisc > 2.3.0; Crashes with 1.1.0-2.3.0.
 depends: libexp >= 1.0
@@ -62,7 +64,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: 6bf9de8c4647a32dee79ad5e787c10311495e3f6b5727bfd03b2d9dcd6a16eed
+sha256sum: 2d912d510b42b1fa04028b0c6a31158ec14b225431b9c2ac0c953d46a7304225
 :
 name: libpq
 version: 0
@@ -92,8 +94,8 @@ https://git.build2.org/cgit/packaging/postgresql/
 
 \
 url: https://www.postgresql.org/
-package-url: https://git.build2.org/cgit/packaging/postgresql/
 email: pgsql-general@postgresql.org; Mailing list.
+package-url: https://git.build2.org/cgit/packaging/postgresql/
 package-email: packaging@build2.org; Mailing list.
 requires: build2 >= 0.4.0
 location: libpq-0.tar.gz
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index 2c8f4b6..79a7989 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -511,6 +511,10 @@ main (int argc, char* argv[])
               "MATLAB.\n\nUseful for conversion of research code into "
               "production environments.");
       assert (fpv5->url == "http://www.example.com/foo/");
+      assert (fpv5->doc_url && *fpv5->doc_url ==
+              "http://www.example.org/projects/libfoo/man.xhtml");
+      assert (fpv5->src_url &&
+              *fpv5->src_url == "https://git.example.org/cgit/libfoo/tree/");
       assert (fpv5->package_url &&
               *fpv5->package_url == "http://www.example.com/foo/pack");
       assert (fpv5->email == "foo-users@example.com");
@@ -602,7 +606,7 @@ main (int argc, char* argv[])
       assert (check_location (fpv5));
 
       assert (fpv5->sha256sum && *fpv5->sha256sum ==
-        "6bf9de8c4647a32dee79ad5e787c10311495e3f6b5727bfd03b2d9dcd6a16eed");
+        "2d912d510b42b1fa04028b0c6a31158ec14b225431b9c2ac0c953d46a7304225");
 
       // Verify libexp package version.
       //
@@ -648,8 +652,8 @@ main (int argc, char* argv[])
       assert (
         epv->build_constraints ==
         build_constraints ({
-          build_constraint (false, "linux*", nullopt, ""),
-          build_constraint (true, "*", nullopt, "Only supported on Linux.")}));
+          build_constraint (true, "*", nullopt, "Only supported on Linux."),
+          build_constraint (false, "linux*", nullopt, "")}));
 
       assert (check_location (epv));
       assert (epv->sha256sum && *epv->sha256sum ==