Skip to content

Commit 5e33073

Browse files
committed
[#3731] bump-lib-versions.sh now updates meson.build files
1 parent ebb49b9 commit 5e33073

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

tools/bump-lib-versions.sh

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (C) 2020-2024 Internet Systems Consortium, Inc. ("ISC")
3+
# Copyright (C) 2020-2025 Internet Systems Consortium, Inc. ("ISC")
44
#
55
# This Source Code Form is subject to the terms of the Mozilla Public
66
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -120,22 +120,23 @@ middle=$(echo "${new_release_tag}" | cut -d '-' -f 2 | cut -d '.' -f 2)
120120
minor=$(echo "${new_release_tag}" | cut -d '-' -f 2 | cut -d '.' -f 3)
121121
new_hooks_version="${major}$(printf '%02d' "${middle}")$(printf '%02d' "${minor}")"
122122

123-
sed -i "s/^\/\/ Version .* of the hooks framework, set for Kea .*/\/\/ Version ${new_hooks_version} of the hooks framework, set for $(echo "${new_release_tag}" | tr '-' ' ')/" "src/lib/hooks/hooks.h"
124-
sed -i "s/KEA_HOOKS_VERSION.*/KEA_HOOKS_VERSION = ${new_hooks_version};/" "src/lib/hooks/hooks.h"
123+
sed -i'' "s/^\/\/ Version .* of the hooks framework, set for Kea .*/\/\/ Version ${new_hooks_version} of the hooks framework, set for $(echo "${new_release_tag}" | tr '-' ' ')/" "src/lib/hooks/hooks.h"
124+
sed -i'' "s/KEA_HOOKS_VERSION.*/KEA_HOOKS_VERSION = ${new_hooks_version};/" "src/lib/hooks/hooks.h"
125125

126126
for lib in $(git diff --name-only "${old_release_tag}" src/lib | cut -d '/' -f 3- | grep -v test | sed "s/\/[^\/]*$//" | sort -uV); do
127127
# Skip over files and anything that is not a directory.
128128
if test ! -d "src/lib/${lib}"; then
129129
continue
130130
fi
131-
# Skip over directories that do not contain Makefile.am.
132-
if test ! -f "src/lib/${lib}/Makefile.am"; then
131+
# Skip over directories that do not contain a meson.build file.
132+
if test ! -f "src/lib/${lib}/meson.build"; then
133133
continue
134134
fi
135135

136-
old_version=$(grep -- '-version-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
136+
old_version=$(grep -Eo "version: '[0-9.]+'," "src/lib/${lib}/meson.build" | grep -Eo '[0-9.]+' | cut -d '.' -f 1)
137137
new_version=$((old_version + increment))
138-
sed -i "s/version-info .*/version-info ${new_version}:0:0/" "src/lib/${lib}/Makefile.am"
138+
sed -i'' "s/version: '.*',/version: '${new_version}.0.0',/" "src/lib/${lib}/meson.build"
139+
sed -i'' "s/version-info .*/version-info ${new_version}:0:0/" "src/lib/${lib}/Makefile.am"
139140
done
140141

141142
if ! ${is_new_tag_stable_release} && ${is_old_tag_stable_release}; then
@@ -144,14 +145,15 @@ if ! ${is_new_tag_stable_release} && ${is_old_tag_stable_release}; then
144145
if test ! -d "src/lib/${lib}"; then
145146
continue
146147
fi
147-
# Skip over directories that do not contain Makefile.am.
148-
if test ! -f "src/lib/${lib}/Makefile.am"; then
148+
# Skip over directories that do not contain a meson.build file.
149+
if test ! -f "src/lib/${lib}/meson.build"; then
149150
continue
150151
fi
151152

152-
old_version=$(grep -- '-version-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
153+
old_version=$(grep -Eo "version: '[0-9.]+'," "src/lib/${lib}/meson.build" | grep -Eo '[0-9.]+' | cut -d '.' -f 1)
153154
new_version=$((old_version + increment_extra))
154-
sed -i "s/version-info .*/version-info ${new_version}:0:0/" "src/lib/${lib}/Makefile.am"
155+
sed -i'' "s/version: '.*',/version: '${new_version}.0.0',/" "src/lib/${lib}/meson.build"
156+
sed -i'' "s/version-info .*/version-info ${new_version}:0:0/" "src/lib/${lib}/Makefile.am"
155157
done
156158
fi
157159

0 commit comments

Comments
 (0)