diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-30 16:47:06 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-30 16:47:06 +0200 |
| commit | d9a068c997c38c82cedf20082dc15b0a575e404e (patch) | |
| tree | fce7124601f960d15a74f420e549556bc8976bbb /build | |
| parent | a094b8f43d7401b01e68e3000b3fea5bb058b19b (diff) | |
Build infrastructure update
Diffstat (limited to 'build')
| -rw-r--r-- | build/bootstrap.build | 14 | ||||
| -rw-r--r-- | build/root.build | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build index eb8e1d7..29f5195 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -3,13 +3,19 @@ # license : MIT; see accompanying LICENSE file project = build2 -version = 0.4.0-a1 subprojects = # No subprojects. -using build@0.3.0 +using build@0.4.0-a1 + +version = 0.4.0-a1 +revision = 0 + +dist.package = $project-$version + +if ($revision != 0) + dist.package += +$revision + using config using dist using test using install - -dist.package = $project-$version diff --git a/build/root.build b/build/root.build index 730200b..7fb4a2c 100644 --- a/build/root.build +++ b/build/root.build @@ -13,6 +13,20 @@ cxx{*}: extension = cxx cxx.poptions =+ -I$out_root -I$src_root +# Load the cli module but only if it's available. This way a distribution +# that includes pre-generated files can be built without installing cli. +# This is also the reason why we need to explicitly spell out individual +# source files instead of using the cli.cxx{} group (it won't be there +# unless the module is configured). +# +using? cli + +if! $cli.configured +{ + define cli: file + cli{*}: extension = cli +} + # All exe{} in tests/ are, well, tests. # tests/exe{*}: test = true |