diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2024-11-01 14:36:26 +0200 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2024-11-01 16:51:58 +0200 |
| commit | c23b8c33affbafa8ca79c883e548fbb69c223908 (patch) | |
| tree | 1956c8a13a35369205b1a312e8b13eaa44b0e8d5 | |
| parent | 4f7fc6dc0e822e536e8bc94ef08b06c1d45b5064 (diff) | |
Add support for comments in package-config task manifest value (GH issue #439)
| -rw-r--r-- | bbot/buildfile | 5 | ||||
| -rw-r--r-- | bbot/worker/worker.cxx | 3 | ||||
| -rw-r--r-- | tests/integration/testscript | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/bbot/buildfile b/bbot/buildfile index bbca810..7810653 100644 --- a/bbot/buildfile +++ b/bbot/buildfile @@ -47,6 +47,11 @@ libue{bbot}: {hxx ixx txx cxx}{* -common-options -version -*.test...} \ {hxx}{version} \ $libs +# VC14 has issues with decorating long names. +# +if ($cxx.id == 'msvc' && $cxx.version.major == 19 && $cxx.version.minor < 10) + cxx.coptions += /wd4503 + if ($cxx.target.class == 'linux') cxx.libs += -ldl diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index a82bdd3..190cfb8 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -1877,7 +1877,8 @@ build (size_t argc, const char* argv[]) try { strings argsv (string_parser::parse_quoted (tm.package_config, - false /* unquote */)); + false /* unquote */, + true /* comments */)); cli::vector_scanner scanv (argsv); cli::group_scanner args (scanv); diff --git a/tests/integration/testscript b/tests/integration/testscript index bcf67d8..dc43e5c 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -406,7 +406,7 @@ rep_type = git rfp = yes #\ - +#\ pkg = libodb-sqlite ver = 2.5.0-b.28.20241030072332.1de3f3f222ba rep_url = "https://git.codesynthesis.com/var/scm/odb/odb.git#win-bin" @@ -415,15 +415,16 @@ rfp = yes tests="tests: odb-tests == $ver"' ? (!$defined(config.odb_tests.database)) config.odb_tests.database=sqlite tests: odb-examples == '"$ver"' ? (!$defined(config.odb_examples.database)) config.odb_examples.database=sqlite' -# Configure libodb as a system dependency on the -# bpkg.test-separate-installed.configure.build step, since it is already -# installed as a dependency of libodb-sqlite. -# package_config = 'package-config: \ +# Configure odb-{tests,examples} packages dependency libodb as system on the +# bpkg.test-separate-installed.configure.build step, since it is +# already installed as a dependency of libodb-sqlite. +# { --config-uuid=00000000-0000-0000-0000-000000000005 }+ ?sys:libodb/* \' #\ +#\ package_config = 'package-config: \ { config.odb_tests.multi_database=true }+ odb-tests |