From 7a12f8bdcb4d497489a4df1e1024e724b316085a Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 29 Oct 2019 13:20:56 +0300
Subject: Swap order of bpkg environment and task args in worker

---
 bbot/worker/worker.cxx | 80 +++++++++++++++++++++++++-------------------------
 doc/manual.cli         |  6 ++--
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index d97dff0..e991910 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -617,7 +617,7 @@ build (size_t argc, const char* argv[])
         fail << "unable to obtain current directory: " << e;
       }
 
-      // bpkg create <env-modules> <config-args> <env-config-args>
+      // bpkg create <env-modules> <env-config-args> <config-args>
       //
       // bpkg.configure.create
       //
@@ -628,15 +628,15 @@ build (size_t argc, const char* argv[])
         "-d", build_dir.string (),
         "--wipe",
         step_args (modules,  step_id::bpkg_configure_create),
-        cargs,
-        step_args (env_args, step_id::bpkg_configure_create));
+        step_args (env_args, step_id::bpkg_configure_create),
+        cargs);
 
       if (!r.status)
         break;
 
       rwd = change_wd (trace, &r.log, build_dir);
 
-      // bpkg add <config-args> <env-config-args> <repository-url>
+      // bpkg add <env-config-args> <config-args> <repository-url>
       //
       // bpkg.configure.add
       //
@@ -644,14 +644,14 @@ build (size_t argc, const char* argv[])
         trace, r.log, wre,
         "-v",
         "add",
-        step_args (config_args, step_id::bpkg_configure_add),
         step_args (env_args,    step_id::bpkg_configure_add),
+        step_args (config_args, step_id::bpkg_configure_add),
         tm.repository.string ());
 
       if (!r.status)
         break;
 
-      // bpkg fetch <config-args> <env-config-args> <trust-options>
+      // bpkg fetch <env-config-args> <config-args> <trust-options>
       //
       // bpkg.configure.fetch
       //
@@ -659,14 +659,14 @@ build (size_t argc, const char* argv[])
         trace, r.log, wre,
         "-v",
         "fetch",
-        step_args (config_args, step_id::bpkg_configure_fetch),
         step_args (env_args,    step_id::bpkg_configure_fetch),
+        step_args (config_args, step_id::bpkg_configure_fetch),
         trust_ops);
 
       if (!r.status)
         break;
 
-      // bpkg build --configure-only <config-args> <env-config-args>
+      // bpkg build --configure-only <env-config-args> <config-args>
       //            <package-name>/<package-version>
       //
       // bpkg.configure.build
@@ -686,8 +686,8 @@ build (size_t argc, const char* argv[])
         "build",
         "--configure-only",
         "--yes",
-        step_args (config_args, step_id::bpkg_configure_build),
         step_args (env_args,    step_id::bpkg_configure_build),
+        step_args (config_args, step_id::bpkg_configure_build),
         "--",
         tm.name.string () + '/' + v.string ());
 
@@ -702,7 +702,7 @@ build (size_t argc, const char* argv[])
     {
       operation_result& r (add_result ("update"));
 
-      // bpkg update <config-args> <env-config-args> <package-name>
+      // bpkg update <env-config-args> <config-args> <package-name>
       //
       // bpkg.update.update
       //
@@ -710,8 +710,8 @@ build (size_t argc, const char* argv[])
         trace, r.log, wre,
         "-v",
         "update",
-        step_args (config_args, step_id::bpkg_update_update),
         step_args (env_args,    step_id::bpkg_update_update),
+        step_args (config_args, step_id::bpkg_update_update),
         tm.name.string ());
 
       if (!r.status)
@@ -785,7 +785,7 @@ build (size_t argc, const char* argv[])
 
         // Configure.
         //
-        // bpkg build --configure-only <config-args> <env-config-args>
+        // bpkg build --configure-only <env-config-args> <config-args>
         //            '<package-name>[ <version-constraint>]'
         //
         // bpkg.configure.build
@@ -797,8 +797,8 @@ build (size_t argc, const char* argv[])
           "build",
           "--configure-only",
           "--yes",
-          step_args (config_args, step_id::bpkg_configure_build),
           step_args (env_args,    step_id::bpkg_configure_build),
+          step_args (config_args, step_id::bpkg_configure_build),
           "--",
           d.string ());
 
@@ -807,7 +807,7 @@ build (size_t argc, const char* argv[])
 
         // Update.
         //
-        // bpkg update <config-args> <env-config-args> <package-name>
+        // bpkg update <env-config-args> <config-args> <package-name>
         //
         // bpkg.update.update
         //
@@ -816,8 +816,8 @@ build (size_t argc, const char* argv[])
           trace, r.log, wre,
           "-v",
           "update",
-          step_args (config_args, step_id::bpkg_update_update),
           step_args (env_args,    step_id::bpkg_update_update),
+          step_args (config_args, step_id::bpkg_update_update),
           pkg);
 
         if (!r.status)
@@ -876,7 +876,7 @@ build (size_t argc, const char* argv[])
         dir_path prj_dir (pkg + '-' + ver.string ());
         dir_path owd (change_wd (trace, &r.log, prj_dir));
 
-        // bpkg test <config-args> <env-config-args> <package-name>
+        // bpkg test <env-config-args> <config-args> <package-name>
         //
         // bpkg.test.test
         //
@@ -886,8 +886,8 @@ build (size_t argc, const char* argv[])
           "-v",
           "test",
           "-d", "..",
-          step_args (config_args, step_id::bpkg_test_test),
           step_args (env_args,    step_id::bpkg_test_test),
+          step_args (config_args, step_id::bpkg_test_test),
           pkg);
 
         if (!r.status)
@@ -913,7 +913,7 @@ build (size_t argc, const char* argv[])
         //
         dir_path owd (change_wd (trace, &r.log, prj_dir));
 
-        // bpkg test <config-args> <env-config-args> <package-name>
+        // bpkg test <env-config-args> <config-args> <package-name>
         //
         // bpkg.test.test
         //
@@ -922,8 +922,8 @@ build (size_t argc, const char* argv[])
           "-v",
           "test",
           "-d", "..",
-          step_args (config_args, step_id::bpkg_test_test),
           step_args (env_args,    step_id::bpkg_test_test),
+          step_args (config_args, step_id::bpkg_test_test),
           tm.name.string ());
 
         if (!r.status)
@@ -974,7 +974,7 @@ build (size_t argc, const char* argv[])
     {
       operation_result& r (add_result ("install"));
 
-      // bpkg install <config-args> <env-config-args> <package-name>
+      // bpkg install <env-config-args> <config-args> <package-name>
       //
       // bpkg.install.install
       //
@@ -982,8 +982,8 @@ build (size_t argc, const char* argv[])
         trace, r.log, wre,
         "-v",
         "install",
-        step_args (config_args, step_id::bpkg_install_install),
         step_args (env_args,    step_id::bpkg_install_install),
+        step_args (config_args, step_id::bpkg_install_install),
         tm.name.string ());
 
       if (!r.status)
@@ -1068,7 +1068,7 @@ build (size_t argc, const char* argv[])
           mods += m;
         }
 
-        // b create(<dir>, <env-modules>) <config-args> <env-config-args>
+        // b create(<dir>, <env-modules>) <env-config-args> <config-args>
         //
         // b.test-installed.create
         //
@@ -1081,8 +1081,8 @@ build (size_t argc, const char* argv[])
           trace, r.log, wre,
           "-V",
           "create('" + out_dir.representation () + "'" + mods + ")",
-          step_args (config_args, step_id::b_test_installed_create),
-          step_args (env_args,    step_id::b_test_installed_create));
+          step_args (env_args,    step_id::b_test_installed_create),
+          step_args (config_args, step_id::b_test_installed_create));
 
         if (!r.status)
           break;
@@ -1092,8 +1092,8 @@ build (size_t argc, const char* argv[])
         strings test_specs;
         for (const dir_path& d: subprj_dirs)
         {
-          // b configure(<subprj-src-dir>@<subprj-out-dir>) <config-args>
-          //                                                <env-config-args>
+          // b configure(<subprj-src-dir>@<subprj-out-dir>) <env-config-args>
+          //                                                <config-args>
           //
           // b.test-installed.configure
           //
@@ -1107,8 +1107,8 @@ build (size_t argc, const char* argv[])
             "configure('" +
             subprj_src_dir.representation () + "'@'" +
             subprj_out_dir.representation () + "')",
-            step_args (config_args, step_id::b_test_installed_configure),
-            step_args (env_args,    step_id::b_test_installed_configure));
+            step_args (env_args,    step_id::b_test_installed_configure),
+            step_args (config_args, step_id::b_test_installed_configure));
 
           if (!r.status)
             break;
@@ -1122,7 +1122,7 @@ build (size_t argc, const char* argv[])
 
         // Build/test subprojects.
         //
-        // b test(<subprj-out-dir>)... <config-args> <env-config-args>
+        // b test(<subprj-out-dir>)... <env-config-args> <config-args>
         //
         // b.test-installed.test
         //
@@ -1131,8 +1131,8 @@ build (size_t argc, const char* argv[])
           trace, r.log, wre,
           "-v",
           test_specs,
-          step_args (config_args, step_id::b_test_installed_test),
-          step_args (env_args,    step_id::b_test_installed_test));
+          step_args (env_args,    step_id::b_test_installed_test),
+          step_args (config_args, step_id::b_test_installed_test));
 
         if (!r.status)
           break;
@@ -1144,7 +1144,7 @@ build (size_t argc, const char* argv[])
       {
         // Configure.
         //
-        // bpkg create <env-modules> <config-args> <env-config-args>
+        // bpkg create <env-modules> <env-config-args> <config-args>
         //
         // bpkg.test-installed.create
         //
@@ -1157,15 +1157,15 @@ build (size_t argc, const char* argv[])
           "-d", config_dir.string (),
           "--wipe",
           step_args (modules,     step_id::bpkg_test_installed_create),
-          step_args (config_args, step_id::bpkg_test_installed_create),
-          step_args (env_args,    step_id::bpkg_test_installed_create));
+          step_args (env_args,    step_id::bpkg_test_installed_create),
+          step_args (config_args, step_id::bpkg_test_installed_create));
 
         if (!r.status)
           break;
 
         dir_path owd (change_wd (trace, &r.log, config_dir));
 
-        // bpkg add <config-args> <env-config-args> <repository-url>
+        // bpkg add <env-config-args> <config-args> <repository-url>
         //
         // bpkg.configure.add
         //
@@ -1173,14 +1173,14 @@ build (size_t argc, const char* argv[])
           trace, r.log, wre,
           "-v",
           "add",
-          step_args (config_args, step_id::bpkg_configure_add),
           step_args (env_args,    step_id::bpkg_configure_add),
+          step_args (config_args, step_id::bpkg_configure_add),
           tm.repository.string ());
 
         if (!r.status)
           break;
 
-        // bpkg fetch <config-args> <env-config-args> <trust-options>
+        // bpkg fetch <env-config-args> <config-args> <trust-options>
         //
         // bpkg.configure.fetch
         //
@@ -1188,8 +1188,8 @@ build (size_t argc, const char* argv[])
           trace, r.log, wre,
           "-v",
           "fetch",
-          step_args (config_args, step_id::bpkg_configure_fetch),
           step_args (env_args,    step_id::bpkg_configure_fetch),
+          step_args (config_args, step_id::bpkg_configure_fetch),
           trust_ops);
 
         if (!r.status)
@@ -1215,7 +1215,7 @@ build (size_t argc, const char* argv[])
     {
       operation_result& r (add_result ("uninstall"));
 
-      // bpkg uninstall <config-args> <env-config-args> <package-name>
+      // bpkg uninstall <env-config-args> <config-args> <package-name>
       //
       // bpkg.uninstall.uninstall
       //
@@ -1223,8 +1223,8 @@ build (size_t argc, const char* argv[])
         trace, r.log, wre,
         "-v",
         "uninstall",
-        step_args (config_args, step_id::bpkg_uninstall_uninstall),
         step_args (env_args,    step_id::bpkg_uninstall_uninstall),
+        step_args (config_args, step_id::bpkg_uninstall_uninstall),
         tm.name.string ());
 
       if (!r.status)
diff --git a/doc/manual.cli b/doc/manual.cli
index 41973f7..4182be5 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -760,7 +760,7 @@ values as discussed in \l{#arch-controller Controller Logic}. The
 \
 # bpkg.configure.create
 #
-bpkg -V create <config-args> <env-modules> <env-config-args>
+bpkg -V create <env-modules> <env-config-args> <config-args>
 
 # bpkg.configure.add
 #
@@ -815,7 +815,7 @@ bpkg -v test <package-name>
   {
     # b.test-installed.create
     #
-    b -V create <config-args> <env-modules> <env-config-args>
+    b -V create <env-modules> <env-config-args> <config-args>
 
     # b.test-installed.configure
     #
@@ -832,7 +832,7 @@ bpkg -v test <package-name>
   {
     # bpkg.test-installed.create
     #
-    bpkg -V create <config-args> <env-modules> <env-config-args>
+    bpkg -V create <env-modules> <env-config-args> <config-args>
 
     # bpkg.configure.add
     #
-- 
cgit v1.1