diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-28 15:28:58 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-28 15:28:58 +0200 |
| commit | 436fd5437eb10463aa8e7cbf8751b91797d1402f (patch) | |
| tree | ed1ed6bd4ff9f6a41776c8eec56224438075dc80 | |
| parent | cfbc9e176c3a3679369c968edfc8134240b1da6c (diff) | |
Switch to version module
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | build/bootstrap.build | 17 | ||||
| -rw-r--r-- | buildfile | 7 | ||||
| -rw-r--r-- | format/buildfile | 6 | ||||
| -rw-r--r-- | manifest | 4 | ||||
| -rw-r--r-- | version | 1 |
6 files changed, 12 insertions, 25 deletions
@@ -11,3 +11,5 @@ *.exe *.exe.dlls/ *.exe.manifest + +version diff --git a/build/bootstrap.build b/build/bootstrap.build index c6211c4..6d11af9 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -1,21 +1,6 @@ project = libformat -using build@0.4.0 - -version = 1.0.0 - -abi_major = 1 -abi_minor = 0 -abi_patch = 0 -abi_prerelease = false - -revision = 0 - -dist.package = $project-$version - -if ($revision != 0) - dist.package += +$revision - +using version using config using dist using install @@ -1,3 +1,4 @@ -d = format/ -./: $d doc{version} file{manifest} -include $d +./: format/ doc{version} file{manifest} + +doc{version}: file{manifest} # Generated by the version module. +doc{version}: dist = true diff --git a/format/buildfile b/format/buildfile index c21eb88..e296bb7 100644 --- a/format/buildfile +++ b/format/buildfile @@ -3,10 +3,10 @@ lib{format}: {hxx cxx}{format} hxx{export} # 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{format}: bin.lib.version = @-$version +if $version.pre_release + lib{format}: bin.lib.version = @"-$version.project_id" else - lib{format}: bin.lib.version = @-$abi_major.$abi_minor + lib{format}: bin.lib.version = @"-$version.major.$version.minor" cxx.poptions =+ "-I$src_root" obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD @@ -11,5 +11,5 @@ url: http://www.example.org/libformat email: hello-users@example.org build-email: builds@build2.org requires: c++11 -depends: * build2 >= 0.4.0 -depends: * bpkg >= 0.4.0 +depends: * build2 >= 0.5.0- +depends: * bpkg >= 0.5.0- diff --git a/version b/version deleted file mode 100644 index 3eefcb9..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -1.0.0 |