Build infrastructure update

4 files changed, 27 insertions, 19 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
diff --git a/build2/buildfile b/build2/buildfile
index 5fc3a89..7e5dd23 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -81,20 +81,8 @@ pkgconfig/{hxx         cxx}{ init             } \
 #
 obj{b context}: cxx.poptions += -DBUILD2_HOST_TRIPLET=\"$cxx.target\"
 
-# 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 configured).
+# Generated options parser.
 #
-using? cli
-
-if! $cli.configured
-{
-  define cli: file
-  cli{*}: extension = cli
-}
-
 {hxx ixx cxx}{b-options}: cli{b}
 
 cli.options += -I $src_root --include-with-brackets --include-prefix build2 \
diff --git a/manifest b/manifest
index bedcc52..beaeaac 100644
--- a/manifest
+++ b/manifest
@@ -8,8 +8,8 @@ description-file: README
 changes-file: NEWS
 url: https://build2.org
 email: users@build2.org
-requires: c++11
-requires: build2 >= 0.3.0
+requires: c++14
+requires: build2 >= 0.4.0
 # @@ Should probably become conditional dependency.
 requires: ? cli ; Only required if changing .cli files.
 depends: libbutl == 0.4.0-a1