From 055e65a0f93ab873c8998cea900229f04beb0d98 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 9 Aug 2021 14:17:06 +0200 Subject: Generate smarter glue buildfile that reads packages.manifest --- bdep/config.cxx | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'bdep/config.cxx') diff --git a/bdep/config.cxx b/bdep/config.cxx index af84c59..d62ad3e 100644 --- a/bdep/config.cxx +++ b/bdep/config.cxx @@ -120,8 +120,10 @@ namespace bdep name = move (s); } - // Verify the configuration directory is not inside one of the packages or - // the project itself if it has a glue buildfile. + // Verify the configuration directory is not inside one of the packages. + // + // Note that the new version of our glue buildfile is smart enough to allow + // creation of configurations inside the project root. // static void verify_configuration_path (const dir_path& cfg, @@ -136,18 +138,6 @@ namespace bdep fail << "configuration directory " << cfg << " is inside package " << p.name << " (" << d << ")"; } - - if (cfg.sub (prj)) - { - path bf; - if (exists (bf = prj / "buildfile") || exists (bf = prj / "build2file")) - { - fail << "configuration directory " << cfg << " is inside project " - << "directory " << prj << - info << "remove glue " << bf << " if you would like to keep " - << "configurations inside your project"; - } - } } shared_ptr -- cgit v1.1