summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-09-10 12:07:15 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2018-09-10 12:07:15 (GMT)
commit94178a8992a8cfee32b5d3340be26c44fcc7a5fe (patch)
tree58bccc5373f7511ef6eccfdcbc0c3e515a1690c0
parent26b0d86a8f36b730bb2343e2b744fdf78259944e (diff)
Align with latest bdep-new
-rw-r--r--libprint/.gitignore2
-rw-r--r--libprint/build/bootstrap.build2
-rw-r--r--libprint/build/export.build2
-rw-r--r--libprint/libprint/buildfile14
-rw-r--r--libprint/tests/basics/buildfile2
-rw-r--r--libprint/tests/basics/driver.cxx6
6 files changed, 14 insertions, 14 deletions
diff --git a/libprint/.gitignore b/libprint/.gitignore
index c3de2e7..cece09c 100644
--- a/libprint/.gitignore
+++ b/libprint/.gitignore
@@ -1,5 +1,3 @@
-.bdep/
-
# Compiler/linker output.
#
*.d
diff --git a/libprint/build/bootstrap.build b/libprint/build/bootstrap.build
index 83dd313..e094ee6 100644
--- a/libprint/build/bootstrap.build
+++ b/libprint/build/bootstrap.build
@@ -3,5 +3,5 @@ project = libprint
using version
using config
using test
-using dist
using install
+using dist
diff --git a/libprint/build/export.build b/libprint/build/export.build
index 34640bd..5a68ae2 100644
--- a/libprint/build/export.build
+++ b/libprint/build/export.build
@@ -3,4 +3,4 @@ $out_root/
include libprint/
}
-export $out_root/libprint/lib{print}
+export $out_root/libprint/$import.target
diff --git a/libprint/libprint/buildfile b/libprint/libprint/buildfile
index e2c6f8a..4a888f3 100644
--- a/libprint/libprint/buildfile
+++ b/libprint/libprint/buildfile
@@ -2,7 +2,7 @@ int_libs = # Interface dependencies.
imp_libs = # Implementation dependencies.
#import imp_libs += libhello%lib{hello}
-lib{print}: {hxx ixx txx cxx}{* -version} hxx{version} $imp_libs $int_libs
+lib{print}: {hxx ixx txx cxx}{** -version} hxx{version} $imp_libs $int_libs
# Include the generated version header into the distribution (so that we don't
# pick up an installed one) and don't remove it when cleaning in src (so that
@@ -13,18 +13,20 @@ hxx{version}: dist = true
hxx{version}: clean = ($src_root != $out_root)
cxx.poptions =+ "-I$out_root" "-I$src_root"
+
+obja{*}: cxx.poptions += -DLIBPRINT_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBPRINT_SHARED_BUILD
+
lib{print}: cxx.export.poptions = "-I$out_root" "-I$src_root"
liba{print}: cxx.export.poptions += -DLIBPRINT_STATIC
libs{print}: cxx.export.poptions += -DLIBPRINT_SHARED
-obja{*}: cxx.poptions += -DLIBPRINT_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBPRINT_SHARED_BUILD
-
lib{print}: 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.
+# 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{print}: bin.lib.version = @"-$version.project_id"
@@ -34,5 +36,5 @@ else
# Install into the libprint/ subdirectory of, say, /usr/include/
# recreating subdirectories.
#
-{hxx ixx txx}{*}: install = include/$project/
+{hxx ixx txx}{*}: install = include/libprint/
{hxx ixx txx}{*}: install.subdirs = true
diff --git a/libprint/tests/basics/buildfile b/libprint/tests/basics/buildfile
index 337d9fa..452b217 100644
--- a/libprint/tests/basics/buildfile
+++ b/libprint/tests/basics/buildfile
@@ -1,3 +1,3 @@
import libs = libprint%lib{print}
-exe{driver}: {hxx ixx txx cxx}{*} $libs
+exe{driver}: {hxx ixx txx cxx}{**} $libs testscript{**}
diff --git a/libprint/tests/basics/driver.cxx b/libprint/tests/basics/driver.cxx
index 8252785..e4439f3 100644
--- a/libprint/tests/basics/driver.cxx
+++ b/libprint/tests/basics/driver.cxx
@@ -4,11 +4,11 @@
#include <libprint/version.hxx>
#include <libprint/print.hxx>
-using namespace std;
-using namespace print;
-
int main ()
{
+ using namespace std;
+ using namespace print;
+
ostringstream o;
print_hello (o, "Hello, World!");
assert (o.str () == "Hello, World!\n");