From bc5192e6d345095eca59cd4b88c8f391ee1b2156 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 15 Oct 2021 22:17:28 +0300
Subject: Release version 1.0.0+8

Mark headers as importable in buildfiles

Drop @ from bin.lib.version in libhello/buildfile

Add commented out c/cxx/cc.internal.scope to root.build

Make glue buildfile to read packages.manifest

Fortify tests against NDEBUG

Add BMI extensions to and ignore compressed .i and .i in .gitignore

Bump project requirements for build2 to 0.14.0-
---
 libformat/.gitignore              |  5 +++++
 libformat/build/root.build        |  8 ++++++++
 libformat/libformat/buildfile     | 12 +++++++-----
 libformat/manifest                |  6 +++---
 libformat/tests/basics/driver.cxx |  4 +++-
 libformat/tests/build/root.build  |  4 ++++
 6 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'libformat')

diff --git a/libformat/.gitignore b/libformat/.gitignore
index cece09c..6435b97 100644
--- a/libformat/.gitignore
+++ b/libformat/.gitignore
@@ -3,9 +3,14 @@
 *.d
 *.t
 *.i
+*.i.*
 *.ii
+*.ii.*
 *.o
 *.obj
+*.gcm
+*.pcm
+*.ifc
 *.so
 *.dll
 *.a
diff --git a/libformat/build/root.build b/libformat/build/root.build
index 9c83a8a..ae3d2a6 100644
--- a/libformat/build/root.build
+++ b/libformat/build/root.build
@@ -1,3 +1,7 @@
+# Uncomment to suppress warnings coming from external libraries.
+#
+#cxx.internal.scope = current
+
 cxx.std = latest
 
 using cxx
@@ -7,6 +11,10 @@ ixx{*}: extension = ixx
 txx{*}: extension = txx
 cxx{*}: extension = cxx
 
+# Assume headers are importable unless stated otherwise.
+#
+hxx{*}: cxx.importable = true
+
 # The test target for cross-testing (running tests under Wine, etc).
 #
 test.target = $cxx.target
diff --git a/libformat/libformat/buildfile b/libformat/libformat/buildfile
index a2f3fdf..4a32b0b 100644
--- a/libformat/libformat/buildfile
+++ b/libformat/libformat/buildfile
@@ -1,6 +1,6 @@
 intf_libs = # Interface dependencies.
 impl_libs = # Implementation dependencies.
-#import impl_libs += libhello%lib{hello}
+#import xxxx_libs += libhello%lib{hello}
 
 lib{format}: {hxx ixx txx cxx}{** -version} hxx{version} $impl_libs $intf_libs
 
@@ -14,12 +14,14 @@ hxx{version}: in{version} $src_root/manifest
   clean = ($src_root != $out_root)
 }
 
+hxx{export}@./: cxx.importable = false
+
 # Build options.
 #
 cxx.poptions =+ "-I$out_root" "-I$src_root"
 
-obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD
+{hbmia obja}{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD
+{hbmis objs}{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD
 
 # Export options.
 #
@@ -37,9 +39,9 @@ libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED
 # for details on the version.* variable values.
 #
 if $version.pre_release
-  lib{format}: bin.lib.version = @"-$version.project_id"
+  lib{format}: bin.lib.version = "-$version.project_id"
 else
-  lib{format}: bin.lib.version = @"-$version.major.$version.minor"
+  lib{format}: bin.lib.version = "-$version.major.$version.minor"
 
 # Install into the libformat/ subdirectory of, say, /usr/include/
 # recreating subdirectories.
diff --git a/libformat/manifest b/libformat/manifest
index 9663780..76499ea 100644
--- a/libformat/manifest
+++ b/libformat/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libformat
-version: 1.0.0+7
+version: 1.0.0+8
 project: hello
 summary: The "Hello World" example formatter library
 license: MIT ; MIT License.
@@ -13,5 +13,5 @@ src-url: https://git.build2.org/cgit/hello/libformat/tree/libformat
 email: users@build2.org
 build-warning-email: builds@build2.org
 builds: all
-depends: * build2 >= 0.11.0
-depends: * bpkg >= 0.11.0
+depends: * build2 >= 0.14.0-
+depends: * bpkg >= 0.14.0-
diff --git a/libformat/tests/basics/driver.cxx b/libformat/tests/basics/driver.cxx
index 42b925a..cb3a130 100644
--- a/libformat/tests/basics/driver.cxx
+++ b/libformat/tests/basics/driver.cxx
@@ -1,9 +1,11 @@
-#include <cassert>
 #include <stdexcept>
 
 #include <libformat/version.hxx>
 #include <libformat/format.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 int main ()
 {
   using namespace std;
diff --git a/libformat/tests/build/root.build b/libformat/tests/build/root.build
index a67b2fe..8fafbfe 100644
--- a/libformat/tests/build/root.build
+++ b/libformat/tests/build/root.build
@@ -7,6 +7,10 @@ ixx{*}: extension = ixx
 txx{*}: extension = txx
 cxx{*}: extension = cxx
 
+# Assume headers are importable unless stated otherwise.
+#
+hxx{*}: cxx.importable = true
+
 # Every exe{} in this subproject is by default a test.
 #
 exe{*}: test = true
-- 
cgit v1.1