From 5e7e9bed6e73ff246919a2d400fb1466619f7abe Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 23 May 2018 14:10:53 +0200 Subject: Update for use with bdep --- .gitignore | 2 ++ build/.gitignore | 2 ++ cli/buildfile | 5 +++++ examples/build/.gitignore | 2 ++ manifest | 4 ++-- repositories.manifest | 6 ++++++ tests/build/.gitignore | 2 ++ 7 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 repositories.manifest diff --git a/.gitignore b/.gitignore index cad5233..de3061e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.bdep/ + # Compiler/linker output. # *.d diff --git a/build/.gitignore b/build/.gitignore index 225c27f..e931f20 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1 +1,3 @@ config.build +root/ +bootstrap/ \ No newline at end of file diff --git a/cli/buildfile b/cli/buildfile index 19d9eba..e1792d3 100644 --- a/cli/buildfile +++ b/cli/buildfile @@ -28,4 +28,9 @@ if $cli.configured # cli.cxx{*}: dist = true cli.cxx{*}: clean = ($src_root != $out_root) + + # We keep the generated code in the repository so copy it back to src + # in case of a forwarded configuration. + # + cli.cxx{*}: backlink = overwrite } diff --git a/examples/build/.gitignore b/examples/build/.gitignore index 225c27f..4a730a3 100644 --- a/examples/build/.gitignore +++ b/examples/build/.gitignore @@ -1 +1,3 @@ config.build +root/ +bootstrap/ diff --git a/manifest b/manifest index 39d1178..b4c1351 100644 --- a/manifest +++ b/manifest @@ -1,7 +1,7 @@ : 1 name: cli version: 1.2.0-b.0.z -summary: Command line interface compiler +summary: Command line interface (CLI) compiler license: MIT tags: command, line, cli, compiler, option, argument, parse, usage, help description-file: README @@ -14,4 +14,4 @@ build-email: builds@codesynthesis.com requires: c++14 depends: * build2 >= 0.7.0- depends: * bpkg >= 0.7.0- -depends: libcutl > 1.11.0-b.1 +depends: libcutl ^1.11.0- diff --git a/repositories.manifest b/repositories.manifest new file mode 100644 index 0000000..4ea63ff --- /dev/null +++ b/repositories.manifest @@ -0,0 +1,6 @@ +: 1 +summary: Command line interface (CLI) compiler repository + +: +role: prerequisite +location: https://git.codesynthesis.com/libcutl/libcutl.git##HEAD diff --git a/tests/build/.gitignore b/tests/build/.gitignore index 225c27f..4a730a3 100644 --- a/tests/build/.gitignore +++ b/tests/build/.gitignore @@ -1 +1,3 @@ config.build +root/ +bootstrap/ -- cgit v1.1