From 1d1335b5ff32c55aad049617d92fe1bbced46572 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 31 Aug 2016 00:38:12 +0300
Subject: Build infrastructure update

---
 build/bootstrap.build | 14 +++++++++++---
 build/root.build      | 18 ++++++++++++++++--
 2 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'build')

diff --git a/build/bootstrap.build b/build/bootstrap.build
index f26e50a..6ea7a32 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -3,11 +3,19 @@
 # license   : MIT; see accompanying LICENSE file
 
 project = bpkg
+subprojects = # No subprojects.
+
+using build@0.4.0-a1
+
 version = 0.4.0-a1
+revision = 0
+
+dist.package = $project-$version
+
+if ($revision != 0)
+  dist.package += +$revision
 
-using build@0.3.0
 using config
 using dist
+using test
 using install
-
-dist.package = $project-$version
diff --git a/build/root.build b/build/root.build
index aa003a3..60d564f 100644
--- a/build/root.build
+++ b/build/root.build
@@ -13,6 +13,20 @@ cxx{*}: extension = cxx
 
 cxx.poptions =+ -I$out_root -I$src_root
 
-# Don't install tests.
+# 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 above we explicitly spelled out individual
+# source files instead of using the cli.cxx{} group (it won't be there
+# unless the module is loaded).
 #
-tests/: install = false
+using? cli
+
+if! $cli.loaded
+{
+  define cli: file
+  cli{*}: extension = cli
+}
+
+# All exe{} in tests/ are, well, tests.
+#
+tests/exe{*}: test = true
-- 
cgit v1.1