From cdbd2f8b36b555cb56b510fccf29fb5a12d66f80 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 1 Feb 2024 14:13:23 +0300 Subject: Add support for enable clause in tests package manifest value --- libbrep/build-extra.sql | 1 + libbrep/build-package.hxx | 1 + libbrep/build.hxx | 2 +- libbrep/build.xml | 2 ++ libbrep/package.hxx | 5 ++++- libbrep/package.xml | 6 ++++++ 6 files changed, 15 insertions(+), 2 deletions(-) (limited to 'libbrep') diff --git a/libbrep/build-extra.sql b/libbrep/build-extra.sql index 9ffbac1..23015f4 100644 --- a/libbrep/build-extra.sql +++ b/libbrep/build-extra.sql @@ -147,6 +147,7 @@ CREATE FOREIGN TABLE build_package_tests ( test_package_version_revision INTEGER NULL, test_type TEXT NOT NULL, test_buildtime BOOLEAN NOT NULL, + test_enable TEXT NULL, test_reflect TEXT NULL) SERVER package_server OPTIONS (table_name 'package_tests'); diff --git a/libbrep/build-package.hxx b/libbrep/build-package.hxx index 94ffb08..6d7fb14 100644 --- a/libbrep/build-package.hxx +++ b/libbrep/build-package.hxx @@ -98,6 +98,7 @@ namespace brep { test_dependency_type type; bool buildtime; + optional enable; optional reflect; }; diff --git a/libbrep/build.hxx b/libbrep/build.hxx index b64b28a..adad535 100644 --- a/libbrep/build.hxx +++ b/libbrep/build.hxx @@ -28,7 +28,7 @@ // #define LIBBREP_BUILD_SCHEMA_VERSION_BASE 20 -#pragma db model version(LIBBREP_BUILD_SCHEMA_VERSION_BASE, 22, closed) +#pragma db model version(LIBBREP_BUILD_SCHEMA_VERSION_BASE, 23, closed) // We have to keep these mappings at the global scope instead of inside the // brep namespace because they need to be also effective in the bbot namespace diff --git a/libbrep/build.xml b/libbrep/build.xml index 2ac0002..0a25488 100644 --- a/libbrep/build.xml +++ b/libbrep/build.xml @@ -1,4 +1,6 @@ + + diff --git a/libbrep/package.hxx b/libbrep/package.hxx index e189339..06e6335 100644 --- a/libbrep/package.hxx +++ b/libbrep/package.hxx @@ -20,7 +20,7 @@ // #define LIBBREP_PACKAGE_SCHEMA_VERSION_BASE 27 -#pragma db model version(LIBBREP_PACKAGE_SCHEMA_VERSION_BASE, 28, closed) +#pragma db model version(LIBBREP_PACKAGE_SCHEMA_VERSION_BASE, 29, closed) namespace brep { @@ -198,6 +198,7 @@ namespace brep { test_dependency_type type; bool buildtime; + optional enable; optional reflect; test_dependency () = default; @@ -205,10 +206,12 @@ namespace brep test_dependency_type t, bool b, optional c, + optional e, optional r) : dependency {move (n), move (c), nullptr /* package */}, type (t), buildtime (b), + enable (move (e)), reflect (move (r)) { } diff --git a/libbrep/package.xml b/libbrep/package.xml index 073fbb6..bf7915e 100644 --- a/libbrep/package.xml +++ b/libbrep/package.xml @@ -1,4 +1,10 @@ + + + + + + -- cgit v1.1