summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-05-23 14:10:53 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-05-23 14:10:53 +0200
commit5e7e9bed6e73ff246919a2d400fb1466619f7abe (patch)
tree15943c14d31e906bcbaf40f05090b542fee28f34
parent038b1acfabf6541b3ea0327d928451bec4aff844 (diff)
downloadcli-5e7e9bed6e73ff246919a2d400fb1466619f7abe.tar.gz
cli-5e7e9bed6e73ff246919a2d400fb1466619f7abe.tar.xz
cli-5e7e9bed6e73ff246919a2d400fb1466619f7abe.zip
Update for use with bdep
-rw-r--r--.gitignore2
-rw-r--r--build/.gitignore2
-rw-r--r--cli/buildfile5
-rw-r--r--examples/build/.gitignore2
-rw-r--r--manifest4
-rw-r--r--repositories.manifest6
-rw-r--r--tests/build/.gitignore2
7 files changed, 21 insertions, 2 deletions
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/