diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2016-08-31 19:24:57 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2016-08-31 19:24:57 +0300 |
| commit | 080fb39e0d41a2d293f2480a5de0673c605cfbdf (patch) | |
| tree | aca8b68059bb42ec756ef4221d75121f4c6058e3 /odb | |
| parent | 88d3b517c08e5a906a224b8b14730f8f80f9ae04 (diff) | |
Build infrastructure update
Diffstat (limited to 'odb')
| -rw-r--r-- | odb/pgsql/buildfile | 21 | ||||
| -rw-r--r-- | odb/pgsql/details/.gitignore | 1 |
2 files changed, 10 insertions, 12 deletions
diff --git a/odb/pgsql/buildfile b/odb/pgsql/buildfile index c2a13a5..50b3097 100644 --- a/odb/pgsql/buildfile +++ b/odb/pgsql/buildfile @@ -49,7 +49,15 @@ details/build2/{h }{ config } \ details/build2/{h }{ config-vc } \ $imp_libs $int_libs -cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_PGSQL_BUILD2 +# 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{odb-pgsql}: bin.lib.version = @-$version +else + lib{odb-pgsql}: bin.lib.version = @-$abi_major.$abi_minor + +cxx.poptions =+ -DLIBODB_PGSQL_BUILD2 obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD objs{*}: cxx.poptions += -DLIBODB_PGSQL_SHARED_BUILD @@ -59,17 +67,6 @@ libs{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_SHARED lib{odb-pgsql}: cxx.export.libs = $int_libs -# 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. -# -using? cli - -if! $cli.loaded -{ - define cli: file - cli{*}: extension = cli -} - details/: { {hxx ixx cxx}{options}: cli{options} diff --git a/odb/pgsql/details/.gitignore b/odb/pgsql/details/.gitignore new file mode 100644 index 0000000..c6e608b --- /dev/null +++ b/odb/pgsql/details/.gitignore @@ -0,0 +1 @@ +options.?xx |