Add support for configuration-specific dependencies

1 files changed, 80 insertions, 29 deletions

diff --git a/doc/manual.cli b/doc/manual.cli
index 64f2179..1fb0184 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -1191,7 +1191,18 @@ environment though some are assigned by the worker during the script execution
 \c{<pkg-config-opts>} (unprefixed options), \c{<pkg-config-vars>} (unprefixed
 variables), \c{<dependency-name>}, \c{<dependency-version-constraint>}, and
 \c{<dep-config-vars>} values result from parsing the
-\l{#arch-task-package-config \c{package-config}} task manifest value.
+\l{#arch-task-package-config \c{package-config}} task manifest value. The
+\c{<*-uuid>} values are assigned as follows:
+
+\
+target-uuid:             00000000-0000-0000-0000-000000000001
+host-uuid:               00000000-0000-0000-0000-000000000002
+module-uuid:             00000000-0000-0000-0000-000000000003
+install-uuid:            00000000-0000-0000-0000-000000000004
+target-installed-uuid:   00000000-0000-0000-0000-000000000005
+host-installed-uuid:     00000000-0000-0000-0000-000000000006
+module-installed-uuid:   00000000-0000-0000-0000-000000000007
+\
 
 Some prefix step ids have fallback step ids which are used in the absence of
 the primary step id values. If the prefix step id differs from the breakpoint
@@ -1229,7 +1240,7 @@ Worker script for \c{target} packages:
 \
 # bpkg.create (bpkg.target.create : b.create, bpkg.create)
 #
-bpkg -V create <env-modules> \\
+bpkg -V create --uuid <target-uuid> <env-modules> \\
      <env-config-args> <tgt-config-args> <pkg-config-args>
 
 # bpkg.configure.add
@@ -1253,7 +1264,9 @@ bpkg -v build --configure-only \\
      [([{ <dep-config-vars> }+] \\
        (?|sys:)<dependency-name> \\
        [<dependency-version-constraint>])...] \\
-     [?sys:<dependency-name>[ <dependency-version-constraint>]...]
+     [?sys:<dependency-name>[ <dependency-version-constraint>]...] \\
+     [({ --config-uuid <target-uuid> [<dep-config-vars>] }+ \\
+       (?[sys:]|sys:)<dependency-name>[ <dependency-version-constraint>])...]
 
 # bpkg.update
 #
@@ -1389,7 +1402,7 @@ bpkg -v update <package-name>
     #   bpkg.test-separate-installed.create_for_target :
     #     bpkg.test-separate-installed.create)
     #
-    bpkg -V create <env-modules> \\
+    bpkg -V create --uuid <target-installed-uuid> <env-modules> \\
          <env-config-args> <tgt-config-args> <pkg-config-args>
 
     # bpkg.test-separate-installed.configure.add (
@@ -1412,7 +1425,11 @@ bpkg -v update <package-name>
          ([{ <test-config-vars> }+] \\
           <test-package-name>[ <test-version-constraint>])... \\
          ?sys:<package-name>/<package-version> \\
-         [?sys:<dependency-name>[ <dependency-version-constraint>]...]
+         [?sys:<dependency-name>[ <dependency-version-constraint>]...] \\
+         [({ --config-uuid <target-installed-uuid> \\
+             [<dep-config-vars>] }+ \\
+           (?[sys:]|sys:)<dependency-name> \\
+           [<dependency-version-constraint>])...]
 
     # For each (runtime) tests, examples, or benchmarks package
     # referred to by the task manifest:
@@ -1496,8 +1513,9 @@ Worker script for \c{host} packages:
 {
   # bpkg.create (bpkg.host.create : b.create, bpkg.create)
   #
-  bpkg -V create --type host -d <host-conf> <env-modules> \\
-       <env-config-args> <tgt-config-args> <pkg-config-args>
+  bpkg -V create --type host -d <host-conf> --uuid <host-uuid> \\
+       <env-modules> <env-config-args> <tgt-config-args> \\
+       <pkg-config-args>
 }
 #
 # Otherwise:
@@ -1506,7 +1524,9 @@ Worker script for \c{host} packages:
   # [bpkg.create]
   #
   b -V create(<host-conf>, cc) config.config.load=~host-no-warnings
-  bpkg -v create --existing --type host -d <host-conf>
+
+  bpkg -v create --existing --type host -d <host-conf> \\
+       --uuid <host-uuid>
 }
 
 # bpkg.configure.add
@@ -1522,7 +1542,7 @@ bpkg -v fetch -d <host-conf> --trust <repository-fp>
 {
   # bpkg.create (bpkg.target.create : b.create, bpkg.create)
   #
-  bpkg -V create -d <install-conf> <env-modules> \\
+  bpkg -V create -d <install-conf> --uuid <install-uuid> <env-modules> \\
        <env-config-args> <tgt-config-args> <pkg-config-args>
 
   # [bpkg.link]
@@ -1544,13 +1564,15 @@ bpkg -v fetch -d <host-conf> --trust <repository-fp>
 {
   # bpkg.create (bpkg.target.create : b.create, bpkg.create)
   #
-  bpkg -V create -d <target-conf> <env-modules> \\
+  bpkg -V create -d <target-conf> --uuid <target-uuid> <env-modules> \\
        <env-config-args> <tgt-config-args> <pkg-config-args>
 
   # [bpkg.create]
   #
   b -V create(<module-conf>, cc) config.config.load=~build2-no-warnings
-  bpkg -v create --existing --type build2 -d <module-conf>
+
+  bpkg -v create --existing --type build2 -d <module-conf> \\
+       --uuid <module-uuid>
 
   # [bpkg.link]
   #
@@ -1620,7 +1642,11 @@ bpkg -v build --configure-only \\
    [<dep-config-vars>] }+ \\
  (?|sys:)<dependency-name>[ <dependency-version-constraint>])... \\
 \\
-[?sys:<dependency-name>[ <dependency-version-constraint>]...]
+[?sys:<dependency-name>[ <dependency-version-constraint>]...] \\
+\\
+({ (--config-uuid <(target|host|module|install)-uuid>)... \\
+   [<dep-config-vars>] }+ \\
+ (?[sys:]|sys:)<dependency-name>[ <dependency-version-constraint>])...
 
 # bpkg.update
 #
@@ -1770,7 +1796,8 @@ bpkg -v update -d <host-conf> <package-name>
     #   bpkg.test-separate-installed.create_for_host :
     #     bpkg.test-separate-installed.create)
     #
-    bpkg -V create --type host -d <host-conf> <env-modules> \\
+    bpkg -V create --type host -d <host-conf> \\
+         --uuid <host-installed-uuid> <env-modules> \\
          <env-config-args> <tgt-config-args> <pkg-config-args>
 
     # If task manifest refers to any runtime tests, examples, or
@@ -1796,15 +1823,17 @@ bpkg -v update -d <host-conf> <package-name>
       #   bpkg.test-separate-installed.create_for_host :
       #     bpkg.test-separate-installed.create)
       #
-      bpkg -V create -d <target-conf> <env-modules> \\
-           <env-config-args> <tgt-config-args> <pkg-config-args>
+      bpkg -V create -d <target-conf> --uuid <target-installed-uuid> \\
+           <env-modules> <env-config-args> <tgt-config-args> \\
+           <pkg-config-args>
 
       # [bpkg.test-separate-installed.create]
       #
       b -V create(<module-conf>, cc) \\
         config.config.load=~build2-no-warnings
 
-      bpkg -v create --existing --type build2 -d <module-conf>
+      bpkg -v create --existing --type build2 -d <module-conf> \\
+           --uuid <module-installed-uuid>
 
       # [bpkg.test-separate-installed.link]
       #
@@ -1842,7 +1871,11 @@ bpkg -v update -d <host-conf> <package-name>
     \\
     ?sys:<package-name>/<package-version> \\
     \\
-    [?sys:<dependency-name>[ <dependency-version-constraint>]...]
+    [?sys:<dependency-name>[ <dependency-version-constraint>]...] \\
+    \\
+    ({ (--config-uuid <(target|host|module)-installed-uuid>)... \\
+       [<dep-config-vars>] }+ \\
+     (?[sys:]|sys:)<dependency-name>[ <dependency-version-constraint>])...
 
     # For each tests, examples, or benchmarks package referred
     # to by the task manifest:
@@ -1928,7 +1961,9 @@ Worker script for \c{module} packages:
   #
   b -V create(<module-conf>, <env-modules>) config.config.load=~build2 \\
     <env-config-args> <tgt-config-args> <pkg-config-args>
-  bpkg -v create --existing --type build2 -d <module-conf>
+
+  bpkg -v create --existing --type build2 -d <module-conf> \\
+       --uuid <module-uuid>
 }
 #
 # Otherwise:
@@ -1937,7 +1972,9 @@ Worker script for \c{module} packages:
   # [bpkg.create]
   #
   b -V create(<module-conf>, cc) config.config.load=~build2-no-warnings
-  bpkg -v create --existing --type build2 -d <module-conf>
+
+  bpkg -v create --existing --type build2 -d <module-conf> \\
+       --uuid <module-uuid>
 }
 
 # bpkg.configure.add
@@ -1956,7 +1993,8 @@ bpkg -v fetch -d <module-conf> --trust <repository-fp>
   b -V create(<install-conf>, <env-modules>) \\
     config.config.load=~build2 \\
     <env-config-args> <tgt-config-args> <pkg-config-args>
-  bpkg -v create --existing --type build2 -d <install-conf>
+
+  bpkg -v create --existing -d <install-conf> --uuid <install-uuid>
 
   # bpkg.configure.add
   #
@@ -1973,13 +2011,16 @@ bpkg -v fetch -d <module-conf> --trust <repository-fp>
 {
   # bpkg.create (bpkg.target.create : b.create, bpkg.create)
   #
-  bpkg -V create -d <target-conf> <env-modules> \\
-       <env-config-args> <tgt-config-args> <pkg-config-args>
+  bpkg -V create -d <target-conf> --uuid <target-uuid> \\
+       <env-modules> <env-config-args> <tgt-config-args> \\
+       <pkg-config-args>
 
   # [bpkg.create]
   #
   b -V create(<host-conf>, cc) config.config.load=~host-no-warnings
-  bpkg -v create --existing --type host -d <host-conf>
+
+  bpkg -v create --existing --type host -d <host-conf> \\
+       --uuid <host-uuid>
 
   # [bpkg.link]
   #
@@ -2035,7 +2076,10 @@ bpkg -v build --configure-only \\
    [<dep-config-vars>] }+ \\
  (?|sys:)<dependency-name>[ <dependency-version-constraint>])... \\
 \\
-[?sys:<dependency-name>[ <dependency-version-constraint>]...]
+[?sys:<dependency-name>[ <dependency-version-constraint>]...] \\
+({ (--config-uuid <(target|host|module|install)-uuid>)... \\
+   [<dep-config-vars>] }+ \\
+ (?[sys:]|sys:)<dependency-name>[ <dependency-version-constraint>])...
 
 # bpkg.update
 #
@@ -2151,20 +2195,23 @@ bpkg -v update -d <module-conf> <package-name>
     b -V create(<module-conf>, cc) \\
       config.config.load=~build2-no-warnings
 
-    bpkg -v create --existing --type build2 -d <module-conf>
+    bpkg -v create --existing --type build2 -d <module-conf> \\
+         --uuid <module-installed-uuid>
 
     # bpkg.test-separate-installed.create (
     #   bpkg.test-separate-installed.create_for_module :
     #     bpkg.test-separate-installed.create)
     #
-    bpkg -V create -d <target-conf> <env-modules> \\
-         <env-config-args> <tgt-config-args> <pkg-config-args>
+    bpkg -V create -d <target-conf> --uuid <target-installed-uuid> \\
+         <env-modules> <env-config-args> <tgt-config-args> \\
+         <pkg-config-args>
 
     # bpkg.test-separate-installed.create (
     #   bpkg.test-separate-installed.create_for_module :
     #     bpkg.test-separate-installed.create)
     #
-    bpkg -V create --type host -d <host-conf> <env-modules> \\
+    bpkg -V create --type host -d <host-conf> \\
+         --uuid <host-installed-uuid> <env-modules> \\
          <env-config-args> <tgt-config-args> <pkg-config-args>
 
     # [bpkg.test-separate-installed.link]
@@ -2196,7 +2243,11 @@ bpkg -v update -d <module-conf> <package-name>
     \\
     ?sys:<package-name>/<package-version> \\
     \\
-    [?sys:<dependency-name>[ <dependency-version-constraint>]...]
+    [?sys:<dependency-name>[ <dependency-version-constraint>]...] \\
+    \\
+    ({ (--config-uuid <(target|host|module)-installed-uuid>)... \\
+       [<dep-config-vars>] }+ \\
+     (?[sys:]|sys:)<dependency-name>[ <dependency-version-constraint>])...
 
     # For each (build-time) tests, examples, or benchmarks package
     # referred to by the task manifest: