Add support for package build configurations

18 files changed, 110 insertions, 34 deletions

diff --git a/tests/load/1/math/libexp-+2-1.2+1.tar.gz b/tests/load/1/math/libexp-+2-1.2+1.tar.gz
index 5beeb84..b223d9f 100644
--- a/tests/load/1/math/libexp-+2-1.2+1.tar.gz
+++ b/tests/load/1/math/libexp-+2-1.2+1.tar.gz
diff --git a/tests/load/1/math/libfoo-+0-X.Y.tar.gz b/tests/load/1/math/libfoo-+0-X.Y.tar.gz
index 6867d4f..95364bb 100644
--- a/tests/load/1/math/libfoo-+0-X.Y.tar.gz
+++ b/tests/load/1/math/libfoo-+0-X.Y.tar.gz
diff --git a/tests/load/1/math/libfoo-1.0.tar.gz b/tests/load/1/math/libfoo-1.0.tar.gz
index 2d445ec..3f23ab9 100644
--- a/tests/load/1/math/libfoo-1.0.tar.gz
+++ b/tests/load/1/math/libfoo-1.0.tar.gz
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 a52548c..2dde730 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/libfoo-benchmarks-1.2.4.tar.gz b/tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz
index 391eb6f..f1c9ba0 100644
--- a/tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz
+++ b/tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz
diff --git a/tests/load/1/math/libfoo-examples-1.2.4.tar.gz b/tests/load/1/math/libfoo-examples-1.2.4.tar.gz
index eac5190..00164e6 100644
--- a/tests/load/1/math/libfoo-examples-1.2.4.tar.gz
+++ b/tests/load/1/math/libfoo-examples-1.2.4.tar.gz
diff --git a/tests/load/1/math/libfoo-tests-1.2.4.tar.gz b/tests/load/1/math/libfoo-tests-1.2.4.tar.gz
index 223e24d..2efccd0 100644
--- a/tests/load/1/math/libfoo-tests-1.2.4.tar.gz
+++ b/tests/load/1/math/libfoo-tests-1.2.4.tar.gz
diff --git a/tests/load/1/math/libpq-0.tar.gz b/tests/load/1/math/libpq-0.tar.gz
index b880520..d4beb18 100644
--- a/tests/load/1/math/libpq-0.tar.gz
+++ b/tests/load/1/math/libpq-0.tar.gz
diff --git a/tests/load/1/math/libstudxml-1.0.0+1.tar.gz b/tests/load/1/math/libstudxml-1.0.0+1.tar.gz
index 41c9637..dcf0ee5 100644
--- a/tests/load/1/math/libstudxml-1.0.0+1.tar.gz
+++ b/tests/load/1/math/libstudxml-1.0.0+1.tar.gz
diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest
index 882aff6..8e66ddf 100644
--- a/tests/load/1/math/packages.manifest
+++ b/tests/load/1/math/packages.manifest
@@ -19,15 +19,23 @@ builds: default legacy
 build-include: windows**d/x86_64**
 build-include: windows-vc_13**
 build-exclude: **; Only supported on Windows.
+bootstrap-build:\
+project = libexp
+
+\
 location: libexp-+2-1.2+1.tar.gz
-sha256sum: 317c8c6f45d9dfdfdef3a823411920cecd51729c7c4f58f9a0b0bbd681c07bd6
+sha256sum: d90cfe583890cd0c05cdfc204e69dd3b986c2da49851f7a87fa0ca870788ff79
 :
 name: libfoo
 version: +0-X.Y
 summary: The Foo Library
 license: MIT
+bootstrap-build:\
+project = libfoo
+
+\
 location: libfoo-+0-X.Y.tar.gz
-sha256sum: c994fd49f051ab7fb25f3a4e68ca878e484c5d3c2cb132b37d41224b0621b618
+sha256sum: c25e5cae2f72664a3961c3ef88a82e67150c4bcc2a5e1fb4d250e621c5574187
 :
 name: libfoo
 version: 1.0
@@ -37,8 +45,12 @@ build-email: foo-builds@example.com
 builds: default legacy; Stable configurations only.
 builds: -32; 64-bit targets only
 builds: &msvc_13_up; Not too old MSVC.
+bootstrap-build:\
+project = libfoo
+
+\
 location: libfoo-1.0.tar.gz
-sha256sum: e89c6d746f8b1ea3ec58d294946d2f683d133438d2ac8c88549ba24c19627e76
+sha256sum: 7382152bac5b4ce10215a5ecd6c94c490d0efc007031d3b03f407d068b74e624
 :
 name: libfoo
 version: 1.2.4+1
@@ -88,32 +100,69 @@ requires: host
 tests: * libfoo-tests == 1.2.4
 examples: libfoo-examples
 benchmarks: libfoo-benchmarks > 0.0.1
+builds: all
+network-build-config: config.libfoo.network=true; Enable networking API.
+network-build-include: windows-vc_14d/x86_64-microsoft-win32-msvc14.0
+network-build-exclude: **
+cache-build-config:\
+config.libfoo.cache=true
+config.libfoo.buffer=4096
+;
+Enable caching.
+\
+cache-builds: default
+cache-builds: -linux
+cache-build-include: windows-vc_14d/x86_64-microsoft-win32-msvc14.0
+cache-build-exclude: **
+bootstrap-build:\
+project = libfoo
+
+\
+root-build:\
+config [bool] config.libfoo.network ?= false
+
+config [bool] config.libfoo.cache ?= false
+config [uint64] config.libfoo.buffer ?= 1024
+
+\
 location: libfoo-1.2.4+1.tar.gz
-sha256sum: d23a7ff116ab7264c3d423af97e4830bdaa8c9101cd95b210b19a97bb8512b74
+sha256sum: fe07978d72ab65c2ad72b0325aa56944cf093248d39edcb472a2fe5835defa3d
 :
 name: libfoo-benchmarks
 version: 1.2.4
 summary: The Foo Math Library benchmarks
 license: MIT
 builds: 64; Fails building for 32 bits.
+bootstrap-build:\
+project = libfoo-benchmarks
+
+\
 location: libfoo-benchmarks-1.2.4.tar.gz
-sha256sum: ba664343db5b9bd574450175834b0dd39d038dcff7387477b6eff0d5783a8ac4
+sha256sum: 8392db99b1ea0c78fe2c73d8c0ae35f8a31d798c8ed26ebf09b4bf557b4e3ce0
 :
 name: libfoo-examples
 version: 1.2.4
 summary: The Foo Math Library examples
 license: MIT
 builds: 64; Fails building for 32 bits.
+bootstrap-build:\
+project = libfoo-examples
+
+\
 location: libfoo-examples-1.2.4.tar.gz
-sha256sum: 1343d1826c3ae5446ad965bc9aa7b1586e4238c7736c344e63a4a6bae3d57a88
+sha256sum: de1bf595994a63361262727594de94edbd77fff8234066da74672e44eb4349f2
 :
 name: libfoo-tests
 version: 1.2.4
 summary: The Foo Math Library tests
 license: MIT
 builds: 64; Fails building for 32 bits.
+bootstrap-build:\
+project = libfoo-tests
+
+\
 location: libfoo-tests-1.2.4.tar.gz
-sha256sum: c5c0520b4e612fa2f8948c42824f3e199926c2395bf2c2f898e83f9eb19261a4
+sha256sum: bff1e47ef4f9658072dd7f412e97f80179d4257323568c3fa77ce6adbf89ebd1
 :
 name: libpq
 version: 0
@@ -148,8 +197,12 @@ package-url: https://git.build2.org/cgit/packaging/postgresql/
 email: pgsql-general@postgresql.org; Mailing list.
 package-email: packaging@build2.org; Mailing list.
 requires: build2 >= 0.4.0
+bootstrap-build:\
+project = libpq
+
+\
 location: libpq-0.tar.gz
-sha256sum: 367e72c8cc4aca1cdb99aacfefb0117ca333031775ff7435b0fa1f4988e33a31
+sha256sum: 2aee2bb1d58d51c657903bbab6253c5d4566b6f3f299ba118da24c7756caebfd
 :
 name: libstudxml
 version: 1.0.0+1
@@ -164,5 +217,9 @@ build-warning-email: studxml-warnings@example.com
 build-error-email: studxml-errors@example.com
 depends: libexpat >= 2.0.0
 depends: libgenx
+bootstrap-build:\
+project = libstudxml
+
+\
 location: libstudxml-1.0.0+1.tar.gz
-sha256sum: 1833906dd93ccc0cda832d6a1b3ef9ed7877bb9958b46d9b2666033d4a7919c9
+sha256sum: aa52d5b49ee1bad825cd6bca554f72636e8451f93c74f9a443bafce3c2bf82c0
diff --git a/tests/load/1/stable/libfoo-1.0.tar.gz b/tests/load/1/stable/libfoo-1.0.tar.gz
index 2d445ec..3f23ab9 100644
--- a/tests/load/1/stable/libfoo-1.0.tar.gz
+++ b/tests/load/1/stable/libfoo-1.0.tar.gz
diff --git a/tests/load/1/stable/libfoo-1.2.2-alpha.1.tar.gz b/tests/load/1/stable/libfoo-1.2.2-alpha.1.tar.gz
index aa5665e..1dfff70 100644
--- a/tests/load/1/stable/libfoo-1.2.2-alpha.1.tar.gz
+++ b/tests/load/1/stable/libfoo-1.2.2-alpha.1.tar.gz
diff --git a/tests/load/1/stable/libfoo-1.2.2.tar.gz b/tests/load/1/stable/libfoo-1.2.2.tar.gz
index 94aca23..22eb89b 100644
--- a/tests/load/1/stable/libfoo-1.2.2.tar.gz
+++ b/tests/load/1/stable/libfoo-1.2.2.tar.gz
diff --git a/tests/load/1/stable/libfoo-1.2.3+4.tar.gz b/tests/load/1/stable/libfoo-1.2.3+4.tar.gz
index 254f355..76439b0 100644
--- a/tests/load/1/stable/libfoo-1.2.3+4.tar.gz
+++ b/tests/load/1/stable/libfoo-1.2.3+4.tar.gz
diff --git a/tests/load/1/stable/libfoo-1.2.4.tar.gz b/tests/load/1/stable/libfoo-1.2.4.tar.gz
index dc64431..da70cd3 100644
--- a/tests/load/1/stable/libfoo-1.2.4.tar.gz
+++ b/tests/load/1/stable/libfoo-1.2.4.tar.gz
diff --git a/tests/load/1/stable/packages.manifest b/tests/load/1/stable/packages.manifest
index 1c5dd58..8d51838 100644
--- a/tests/load/1/stable/packages.manifest
+++ b/tests/load/1/stable/packages.manifest
@@ -9,8 +9,12 @@ build-email: foo-builds@example.com
 builds: default legacy; Stable configurations only.
 builds: -32; 64-bit targets only
 builds: &msvc_13_up; Not too old MSVC.
+bootstrap-build:\
+project = libfoo
+
+\
 location: libfoo-1.0.tar.gz
-sha256sum: e89c6d746f8b1ea3ec58d294946d2f683d133438d2ac8c88549ba24c19627e76
+sha256sum: 7382152bac5b4ce10215a5ecd6c94c490d0efc007031d3b03f407d068b74e624
 :
 name: libfoo
 version: 1.2.2-alpha.1
@@ -23,8 +27,12 @@ email: foo-users@example.com
 depends: libmisc [0.1 2.0-) | libmisc [2.0 5.0]
 depends: libgenx (0.2 3.0)
 depends: libexpat < 5.2 | libexpat (1 5.1]
+bootstrap-build:\
+project = libfoo
+
+\
 location: libfoo-1.2.2-alpha.1.tar.gz
-sha256sum: f5d3e9e6e8f9621a638b1375d31f0eb50e6279d8066170b25da21e84198cfd82
+sha256sum: 71321f6616036380ac5c9c5dc81efa04b23577ef9dc18f1ce413587bb57677c9
 :
 name: libfoo
 version: 1.2.2
@@ -35,8 +43,12 @@ url: http://www.example.com/foo/
 email: foo-users@example.com
 depends: libbar <= 2.4.0
 depends: libexp == +2-1.2
+bootstrap-build:\
+project = libfoo
+
+\
 location: libfoo-1.2.2.tar.gz
-sha256sum: 088068ea3d69542a153f829cf836013374763148fba0a43d8047974f58b5efd7
+sha256sum: 75d2a7d3eec62d63afd3d3a84d91bd02b05ecb16cd0907d5b0db1fc654e3753f
 :
 name: libfoo
 version: 1.2.3+4
@@ -47,8 +59,12 @@ keywords: c++ foo
 url: http://www.example.com/foo/
 email: foo-users@example.com
 depends: libmisc >= 2.0.0
+bootstrap-build:\
+project = libfoo
+
+\
 location: libfoo-1.2.3+4.tar.gz
-sha256sum: f2ebecac6cac8addd7c623bc1becf055e76b13a0d2dd385832b92c38c58956d8
+sha256sum: 24c53899bd4dbfdde6a727e07724984bfb4ca7f20142291c40e30304f15434c3
 :
 name: libfoo
 version: 1.2.4
@@ -62,5 +78,9 @@ changes: some changes 2
 url: http://www.example.com/foo/
 email: foo-users@example.com
 depends: libmisc >= 2.0.0
+bootstrap-build:\
+project = libfoo
+
+\
 location: libfoo-1.2.4.tar.gz
-sha256sum: aa1606323bfc59b70de642629dc5d8318cc5348e3646f90ed89406d975db1e1d
+sha256sum: 98f80ca0cd1c053fd45ab37f72a6a31f1a0304747c636822df8d573420284642
diff --git a/tests/load/1/stable/signature.manifest b/tests/load/1/stable/signature.manifest
index 8201745..9d3b944 100644
--- a/tests/load/1/stable/signature.manifest
+++ b/tests/load/1/stable/signature.manifest
@@ -1,13 +1,13 @@
 : 1
-sha256sum: 2c710248e2654f57c0d572585195f2221a33a6fbe753a511874b2006db5c221a
+sha256sum: 300aaa95b27809ca4bccf4b6eeb5f81701117457bd9e6018964004d4bbedbfb8
 signature:\
-C8H2WkJR27bK35E0IAQxdLtR7vjYcQxvMxdPQSnk3GhpFQwRhpQ/dF0b81cC1a6ytd5/uPwM/L+x
-Ki2GJvIuvvWurySofFGVd1iMYeOKMpHWbcYx+MvoDm2vxgUQxh3he5AAt5FPvvaGd72fmRWeoVdm
-cpZmPKhGIQffGTcL4bifgXgCEQDPjArZY2g7Van/ZWbEhFQGRYVGvLbfZpeNG5OZSYV1kRrCI7lE
-nGMsH/HfrkUivwPx5K0WyDF+ukj/DoZaY5PD+XHZ6hVVza++X5/0mH55yurrU1DG+jV/2HP1WGXL
-tZq9sWOrdCG1zkfdefRY5ZbYVc82PeLzdONNLNaPYs2G/wFoPaYiXweiJ/rF6OGm6mcquupaBCeX
-iR+c9IHiZBXhxGXkY0YsVzgsv/RxDi8LfUS6z/h1NN686F93jPwieKDJRBGl6voyH1h8O1j/aRCw
-1MpeNFttF+U4GPDWkUadCoxpygPZOHJc7SW0EreJI8iePwrQDaJSdxo11DqCSpHs57YUnhJUT/q1
-C9RalWCKfAJgk5i83dbKBpTZqCq0oHoh5iHTr9y9IH9yAAvoUudppoM1IGNnT42frVNXPwjRJLB2
-j0NDKPkeBBg0Cgd2vZ7kvarKOP0GPiNUOUv17mFo6c1W9DEmZFoAfc0iyYOE76VgJsAK0UY8MZI=
+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=
 \
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index 05efd15..ae3d03d 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -3,7 +3,6 @@
 
 #include <iostream>
 #include <exception>
-#include <algorithm> // sort(), find()
 
 #include <odb/session.hxx>
 #include <odb/transaction.hxx>
@@ -397,7 +396,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpvxy));
 
     assert (fpvxy->sha256sum && *fpvxy->sha256sum ==
-            "c994fd49f051ab7fb25f3a4e68ca878e484c5d3c2cb132b37d41224b0621b618");
+            "c25e5cae2f72664a3961c3ef88a82e67150c4bcc2a5e1fb4d250e621c5574187");
 
     assert (fpvxy->buildable);
 
@@ -433,7 +432,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv1));
 
     assert (fpv1->sha256sum && *fpv1->sha256sum ==
-            "e89c6d746f8b1ea3ec58d294946d2f683d133438d2ac8c88549ba24c19627e76");
+            "7382152bac5b4ce10215a5ecd6c94c490d0efc007031d3b03f407d068b74e624");
 
     assert (fpv1->buildable);
 
@@ -478,7 +477,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv2));
 
     assert (fpv2->sha256sum && *fpv2->sha256sum ==
-            "088068ea3d69542a153f829cf836013374763148fba0a43d8047974f58b5efd7");
+            "75d2a7d3eec62d63afd3d3a84d91bd02b05ecb16cd0907d5b0db1fc654e3753f");
 
     assert (!fpv2->buildable);
 
@@ -542,7 +541,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv2a));
 
     assert (fpv2a->sha256sum && *fpv2a->sha256sum ==
-            "f5d3e9e6e8f9621a638b1375d31f0eb50e6279d8066170b25da21e84198cfd82");
+            "71321f6616036380ac5c9c5dc81efa04b23577ef9dc18f1ce413587bb57677c9");
 
     assert (!fpv2a->buildable);
 
@@ -580,7 +579,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv3));
 
     assert (fpv3->sha256sum && *fpv3->sha256sum ==
-            "f2ebecac6cac8addd7c623bc1becf055e76b13a0d2dd385832b92c38c58956d8");
+            "24c53899bd4dbfdde6a727e07724984bfb4ca7f20142291c40e30304f15434c3");
 
     assert (!fpv3->buildable);
 
@@ -619,7 +618,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv4));
 
     assert (fpv4->sha256sum && *fpv4->sha256sum ==
-            "aa1606323bfc59b70de642629dc5d8318cc5348e3646f90ed89406d975db1e1d");
+            "98f80ca0cd1c053fd45ab37f72a6a31f1a0304747c636822df8d573420284642");
 
     assert (!fpv4->buildable);
 
@@ -708,7 +707,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (xpv));
 
     assert (xpv->sha256sum && *xpv->sha256sum ==
-            "1833906dd93ccc0cda832d6a1b3ef9ed7877bb9958b46d9b2666033d4a7919c9");
+            "aa52d5b49ee1bad825cd6bca554f72636e8451f93c74f9a443bafce3c2bf82c0");
 
     assert (xpv->buildable);
 
@@ -844,7 +843,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv5));
 
     assert (fpv5->sha256sum && *fpv5->sha256sum ==
-            "d23a7ff116ab7264c3d423af97e4830bdaa8c9101cd95b210b19a97bb8512b74");
+            "fe07978d72ab65c2ad72b0325aa56944cf093248d39edcb472a2fe5835defa3d");
 
     assert (fpv5->buildable);
 
@@ -903,7 +902,7 @@ test_pkg_repos (const cstrings& loader_args,
 
     assert (check_location (epv));
     assert (epv->sha256sum && *epv->sha256sum ==
-            "317c8c6f45d9dfdfdef3a823411920cecd51729c7c4f58f9a0b0bbd681c07bd6");
+            "d90cfe583890cd0c05cdfc204e69dd3b986c2da49851f7a87fa0ca870788ff79");
 
     // Verify libpq package version.
     //