From 38fe75fe9780128dc548149d790b7731ea6f59eb Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 5 Mar 2019 15:18:57 +0300 Subject: Align with latest bdep-new --- odb/pgsql/buildfile | 56 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/odb/pgsql/buildfile b/odb/pgsql/buildfile index 3b5983c..c2bb0d4 100644 --- a/odb/pgsql/buildfile +++ b/odb/pgsql/buildfile @@ -15,27 +15,41 @@ lib{odb-pgsql}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \ # clean results in a state identical to distributed). # hxx{version-build2}: in{version-build2} $src_root/manifest -hxx{version-build2}: dist = true -hxx{version-build2}: clean = ($src_root != $out_root) +hxx{version-build2}: +{ + dist = true + clean = ($src_root != $out_root) +} -# For pre-releases use the complete version to make sure they cannot be used -# in place of another pre-release or the final version. +# Build options. # -if $version.pre_release - lib{odb-pgsql}: bin.lib.version = @"-$version.project_id" -else - lib{odb-pgsql}: bin.lib.version = @"-$version.major.$version.minor" - cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_PGSQL_BUILD2 + obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD objs{*}: cxx.poptions += -DLIBODB_PGSQL_SHARED_BUILD -lib{odb-pgsql}: cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_PGSQL_BUILD2 +# Export options. +# +lib{odb-pgsql}: +{ + cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_PGSQL_BUILD2 + cxx.export.libs = $int_libs +} + liba{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_STATIC libs{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_SHARED -lib{odb-pgsql}: cxx.export.libs = $int_libs +# For pre-releases use the complete version to make sure they cannot be used +# in place of another pre-release or the final version. See the version module +# for details on the version.* variable values. +# +if $version.pre_release + lib{odb-pgsql}: bin.lib.version = @"-$version.project_id" +else + lib{odb-pgsql}: bin.lib.version = @"-$version.major.$version.minor" +# Generated options parser. +# details/ { if $cli.configured @@ -52,9 +66,12 @@ details/ # distributed). But don't install their headers since they are only used # internally in the database implementation. # - cli.cxx{*}: dist = true - cli.cxx{*}: clean = ($src_root != $out_root) - cli.cxx{*}: install = false + cli.cxx{*}: + { + dist = true + clean = ($src_root != $out_root) + install = false + } } else # No install for the pre-generated case. @@ -62,13 +79,16 @@ details/ hxx{options}@./ ixx{options}@./: install = false } -# Install into the odb/pgsql/ subdirectory of, say, /usr/include/ recreating -# subdirectories. +# Install into the odb/pgsql/ subdirectory of, say, /usr/include/ +# recreating subdirectories. # install_include = [dir_path] include/odb/pgsql/ -{hxx ixx txx}{*}: install = $install_include -{hxx ixx txx}{*}: install.subdirs = true +{hxx ixx txx}{*}: +{ + install = $install_include + install.subdirs = true +} # We want these to be picked up whether LIBODB_PGSQL_BUILD2 is defined or not. # -- cgit v1.1