diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-30 16:32:41 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-30 16:32:41 +0200 |
| commit | d44cf613a9ebb26ab057d35796899981cbed71f1 (patch) | |
| tree | 9536bd25564e55ca076d5cc9cbd0f079c80653d7 | |
| parent | ab616aa06552ff0ded7c600d7fde84e60b9504b3 (diff) | |
Build infrastructure update
| -rw-r--r-- | build/bootstrap.build | 18 | ||||
| -rw-r--r-- | build/root.build | 3 | ||||
| -rw-r--r-- | buildfile | 5 | ||||
| -rw-r--r-- | butl/buildfile | 8 | ||||
| -rw-r--r-- | manifest | 4 |
5 files changed, 30 insertions, 8 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build index bbe167a..50d1639 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -3,12 +3,24 @@ # license : MIT; see accompanying LICENSE file project = libbutl + +using build@0.4.0-a1 + version = 0.4.0-a1 -using build@0.3.0 +abi_major = 0 +abi_minor = 4 +abi_patch = 0 +abi_prerelease = true + +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 8550239..2ace472 100644 --- a/build/root.build +++ b/build/root.build @@ -11,7 +11,6 @@ ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx -# All exe{} in tests/ are, well, tests. Don't install them. +# All exe{} in tests/ are, well, tests. # tests/exe{*}: test = true -tests/: install = false @@ -6,4 +6,7 @@ d = butl/ tests/ ./: $d doc{LICENSE NEWS README version} file{manifest} include $d -doc{INSTALL*}: install = false +# Don't install tests or the INSTALL file. +# +dir{tests/}: install = false +doc{INSTALL}@./: install = false diff --git a/butl/buildfile b/butl/buildfile index a2ba945..4ac0672 100644 --- a/butl/buildfile +++ b/butl/buildfile @@ -35,6 +35,14 @@ lib{butl}: file{sha256c.c} # lib{butl}: file{strptime.c timelocal.h timelocal.c} +# For pre-releases use the complete version to make sure they cannot be used +# in place of another pre-release or the final version. +# +if $abi_prerelease + lib{butl}: bin.lib.version = @-$version +else + lib{butl}: bin.lib.version = @-$abi_major.$abi_minor + cxx.poptions =+ -I$src_root obja{*}: cxx.poptions += -DLIBBUTL_STATIC_BUILD objs{*}: cxx.poptions += -DLIBBUTL_SHARED_BUILD @@ -3,10 +3,10 @@ name: libbutl version: 0.4.0-a1 summary: build2 utility library license: MIT, BSD-2; MIT except for 4 files from the FreeBSD project. -tags: build2, utility +tags: build2, utility, library description-file: README changes-file: NEWS url: https://build2.org email: users@build2.org requires: c++11 -requires: build2 >= 0.3.0 +requires: build2 >= 0.4.0 |