aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-01-26 13:06:32 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-01-26 13:06:32 +0200
commit252559253c42380baab67c3528359ee635c8a6d5 (patch)
tree3f05605e42648d977e650a21025634338bd2aa93
parentcfb40e848fcc429d0967b3d77c93a762ca7d2e0b (diff)
Adjust to match new bash module semantics
-rw-r--r--libbutl/buildfile2
-rw-r--r--libbutl/manifest-parser.bash.in2
-rw-r--r--libbutl/manifest-serializer.bash.in2
-rw-r--r--libbutl/standard-version.bash.in2
-rw-r--r--tests/manifest-parser/driver.in2
-rw-r--r--tests/manifest-serializer/driver.in2
-rw-r--r--tests/standard-version/driver.in2
7 files changed, 7 insertions, 7 deletions
diff --git a/libbutl/buildfile b/libbutl/buildfile
index f03bdf1..b0cd830 100644
--- a/libbutl/buildfile
+++ b/libbutl/buildfile
@@ -21,4 +21,4 @@ exe{standard-version}: cxx{standard-version} $libs
# Install our binding support executables next to the modules.
#
-exe{*}: install = bin/libbutl/
+exe{*}: install = bin/libbutl.bash/
diff --git a/libbutl/manifest-parser.bash.in b/libbutl/manifest-parser.bash.in
index df06138..2edd517 100644
--- a/libbutl/manifest-parser.bash.in
+++ b/libbutl/manifest-parser.bash.in
@@ -7,7 +7,7 @@ else
butl_manifest_parser=true
fi
-@import libbutl/utility@
+@import libbutl.bash/utility@
# Parse the manifest reading from stdin and writing the binary representation
# to stdout.
diff --git a/libbutl/manifest-serializer.bash.in b/libbutl/manifest-serializer.bash.in
index ce99779..85ecf30 100644
--- a/libbutl/manifest-serializer.bash.in
+++ b/libbutl/manifest-serializer.bash.in
@@ -7,7 +7,7 @@ else
butl_manifest_serializer=true
fi
-@import libbutl/utility@
+@import libbutl.bash/utility@
# Serialize the manifest reading the binary representation from stdin and
# writing to stdout. Unless --long-lines is specified, break lines in values.
diff --git a/libbutl/standard-version.bash.in b/libbutl/standard-version.bash.in
index 20215d9..da5c6d7 100644
--- a/libbutl/standard-version.bash.in
+++ b/libbutl/standard-version.bash.in
@@ -7,7 +7,7 @@ else
butl_standard_version=true
fi
-@import libbutl/utility@
+@import libbutl.bash/utility@
# Check that the specified predicates are true for a standard version.
#
diff --git a/tests/manifest-parser/driver.in b/tests/manifest-parser/driver.in
index bf95410..bdc16bb 100644
--- a/tests/manifest-parser/driver.in
+++ b/tests/manifest-parser/driver.in
@@ -6,7 +6,7 @@
trap "{ exit 1; }" ERR
set -o errtrace # Trap ERR in functions.
-@import libbutl/manifest-parser@
+@import libbutl.bash/manifest-parser@
butl_manifest_parser_start "$@"
diff --git a/tests/manifest-serializer/driver.in b/tests/manifest-serializer/driver.in
index 65b3595..8e02049 100644
--- a/tests/manifest-serializer/driver.in
+++ b/tests/manifest-serializer/driver.in
@@ -6,7 +6,7 @@
trap "{ exit 1; }" ERR
set -o errtrace # Trap ERR in functions.
-@import libbutl/manifest-serializer@
+@import libbutl.bash/manifest-serializer@
butl_manifest_serializer_start "$@"
diff --git a/tests/standard-version/driver.in b/tests/standard-version/driver.in
index f1df612..5f4544b 100644
--- a/tests/standard-version/driver.in
+++ b/tests/standard-version/driver.in
@@ -3,6 +3,6 @@
# file : tests/standard-version/driver.in
# license : MIT; see accompanying LICENSE file
-@import libbutl/standard-version@
+@import libbutl.bash/standard-version@
butl_standard_version "$@"