summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2024-06-12 11:28:24 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2024-06-12 11:28:53 +0300
commit628b316fe9ef7d83a231407e85020978397f8e58 (patch)
tree4e04bec7dd19b9b58dd572e19f708ad2100acca3
parenta0d8acd222160d0dce55970419ab83494d73c044 (diff)
Release version 1.1.0+12HEADv1.1.0+12master
Don't set cxx.importable variable and don't refer to hbmis/hbmia targets in buildfiles.
-rw-r--r--libhello/build/root.build4
-rw-r--r--libhello/libhello/buildfile12
-rw-r--r--libhello/manifest2
-rw-r--r--libhello/tests/build/root.build4
4 files changed, 6 insertions, 16 deletions
diff --git a/libhello/build/root.build b/libhello/build/root.build
index ae3d2a6..21e0a2e 100644
--- a/libhello/build/root.build
+++ b/libhello/build/root.build
@@ -11,10 +11,6 @@ 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/libhello/libhello/buildfile b/libhello/libhello/buildfile
index c108327..124aa96 100644
--- a/libhello/libhello/buildfile
+++ b/libhello/libhello/buildfile
@@ -5,14 +5,12 @@ lib{hello}: {hxx ixx txx cxx}{** -version} hxx{version} $impl_libs $intf_libs
hxx{version}: in{version} $src_root/manifest
-hxx{export}@./: cxx.importable = false
-
# Build options.
#
cxx.poptions =+ "-I$out_root" "-I$src_root"
-{hbmia obja}{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
-{hbmis objs}{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
+obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
# Export options.
#
@@ -25,9 +23,9 @@ lib{hello}:
liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC
libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
-# 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.
+# 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{hello}: bin.lib.version = "-$version.project_id"
diff --git a/libhello/manifest b/libhello/manifest
index 83530d8..182a979 100644
--- a/libhello/manifest
+++ b/libhello/manifest
@@ -1,6 +1,6 @@
: 1
name: libhello
-version: 1.1.0+11
+version: 1.1.0+12
language: c++
project: hello
summary: The "Hello World" example library
diff --git a/libhello/tests/build/root.build b/libhello/tests/build/root.build
index 8fafbfe..a67b2fe 100644
--- a/libhello/tests/build/root.build
+++ b/libhello/tests/build/root.build
@@ -7,10 +7,6 @@ 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