From 28f3f8b92fc0b90d6646712eb2304c63c7fbc80e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 1 Sep 2016 08:35:09 +0200 Subject: Build system update --- build/.gitignore | 1 + build/bootstrap.build | 7 ++++--- build/root.build | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 build/.gitignore (limited to 'build') diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000..225c27f --- /dev/null +++ b/build/.gitignore @@ -0,0 +1 @@ +config.build diff --git a/build/bootstrap.build b/build/bootstrap.build index dfab993..ddf9a05 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -3,13 +3,14 @@ # license : MIT; see accompanying LICENSE file project = build2-toolchain -version = 0.4.0-a1 subprojects = libbutl build2 libsqlite3 libodb libodb-sqlite libbpkg bpkg using build@0.4.0-a1 + +version = 0.4.0-a1 +dist.package = $project-$version + using config using dist using test # Note: needed for dist to work in subprojects with tests. using install - -dist.package = $project-$version diff --git a/build/root.build b/build/root.build index 927ee64..ac55324 100644 --- a/build/root.build +++ b/build/root.build @@ -2,9 +2,9 @@ # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -# Load common modules that are used by subproject so that they use -# common configuration. +# Load common modules that are used by subproject so that they use common +# configuration. # -using cxx -using c -using? cli +using cxx.config +using c.config +using? cli.config -- cgit v1.1