Skip to content

Commit 7a7fad6

Browse files
author
Razvan Becheriu
committed
[#3459] added util/io library to script and bumped version
1 parent 3c5e39f commit 7a7fad6

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/lib/hooks/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ libkea_hooks_la_SOURCES += hooks_messages.cc hooks_messages.h
3838

3939
libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
4040
libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS)
41-
libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 108:0:0
41+
libkea_hooks_la_LDFLAGS = -no-undefined -version-info 108:0:0
42+
libkea_hooks_la_LDFLAGS += $(AM_LDFLAGS)
4243
libkea_hooks_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la
4344
libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
4445
libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la

src/lib/util/io/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ libkea_util_io_la_SOURCES = fd.h fd.cc
99
libkea_util_io_la_SOURCES += sockaddr_util.h
1010
libkea_util_io_la_SOURCES += pktinfo_utilities.h
1111
libkea_util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
12-
libkea_util_io_la_LDFLAGS = -no-undefined -version-info 0:1:0
12+
libkea_util_io_la_LDFLAGS = -no-undefined -version-info 10:0:0
1313

1414
CLEANFILES = *.gcno *.gcda

tools/bump-lib-versions.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,23 +123,31 @@ new_hooks_version="${major}$(printf '%02d' "${middle}")$(printf '%02d' "${minor}
123123
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"
124124
sed -i "s/KEA_HOOKS_VERSION.*/KEA_HOOKS_VERSION = ${new_hooks_version};/" "src/lib/hooks/hooks.h"
125125

126-
for lib in $(git diff --name-only "${old_release_tag}" src/lib | cut -d '/' -f 3 | sort -uV); do
126+
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
133+
continue
134+
fi
131135

132136
old_version=$(grep -- '-version-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
133137
new_version=$((old_version + increment))
134138
sed -i "s/version-info .*/version-info ${new_version}:0:0/" "src/lib/${lib}/Makefile.am"
135139
done
136140

137141
if ! ${is_new_tag_stable_release} && ${is_old_tag_stable_release}; then
138-
for lib in $(find 'src/lib' -mindepth 1 -maxdepth 1 -type d | cut -d '/' -f 3 | sort -uV); do
142+
for lib in $(find 'src/lib' -type d | cut -d '/' -f 3- | grep -v test | sed "s/\/[^\/]*$//" | sort -uV); do
139143
# Skip over files and anything that is not a directory.
140144
if test ! -d "src/lib/${lib}"; then
141145
continue
142146
fi
147+
# Skip over directories that do not contain Makefile.am.
148+
if test ! -f "src/lib/${lib}/Makefile.am"; then
149+
continue
150+
fi
143151

144152
old_version=$(grep -- '-version-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
145153
new_version=$((old_version + increment_extra))

0 commit comments

Comments
 (0)