From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 20 Jun 2024 19:25:03 +0000 (+0300)
Subject: [#3459] added util/io library to script and bumped version
X-Git-Tag: Kea-2.7.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a7fad65192051c8cb93e3db915ac107a309ffdc;p=thirdparty%2Fkea.git

[#3459] added util/io library to script and bumped version
---

diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am
index 73b798040c..0e5cc4a636 100644
--- a/src/lib/hooks/Makefile.am
+++ b/src/lib/hooks/Makefile.am
@@ -38,7 +38,8 @@ libkea_hooks_la_SOURCES += hooks_messages.cc hooks_messages.h
 
 libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_hooks_la_LDFLAGS  = $(AM_LDFLAGS) -no-undefined -version-info 108:0:0
+libkea_hooks_la_LDFLAGS  = -no-undefined -version-info 108:0:0
+libkea_hooks_la_LDFLAGS += $(AM_LDFLAGS)
 libkea_hooks_la_LIBADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
diff --git a/src/lib/util/io/Makefile.am b/src/lib/util/io/Makefile.am
index 9756d9d60e..1fed592ab5 100644
--- a/src/lib/util/io/Makefile.am
+++ b/src/lib/util/io/Makefile.am
@@ -9,6 +9,6 @@ libkea_util_io_la_SOURCES = fd.h fd.cc
 libkea_util_io_la_SOURCES += sockaddr_util.h
 libkea_util_io_la_SOURCES += pktinfo_utilities.h
 libkea_util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_util_io_la_LDFLAGS = -no-undefined -version-info 0:1:0
+libkea_util_io_la_LDFLAGS = -no-undefined -version-info 10:0:0
 
 CLEANFILES = *.gcno *.gcda
diff --git a/tools/bump-lib-versions.sh b/tools/bump-lib-versions.sh
index b21becf24d..7fd576abb2 100755
--- a/tools/bump-lib-versions.sh
+++ b/tools/bump-lib-versions.sh
@@ -123,11 +123,15 @@ new_hooks_version="${major}$(printf '%02d' "${middle}")$(printf '%02d' "${minor}
 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"
 sed -i "s/KEA_HOOKS_VERSION.*/KEA_HOOKS_VERSION = ${new_hooks_version};/" "src/lib/hooks/hooks.h"
 
-for lib in $(git diff --name-only "${old_release_tag}" src/lib | cut -d '/' -f 3 | sort -uV); do
+for lib in $(git diff --name-only "${old_release_tag}" src/lib | cut -d '/' -f 3- | grep -v test | sed "s/\/[^\/]*$//" | sort -uV); do
   # Skip over files and anything that is not a directory.
   if test ! -d "src/lib/${lib}"; then
     continue
   fi
+  # Skip over directories that do not contain Makefile.am.
+  if test ! -f "src/lib/${lib}/Makefile.am"; then
+    continue
+  fi
 
   old_version=$(grep -- '-version-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
   new_version=$((old_version + increment))
@@ -135,11 +139,15 @@ for lib in $(git diff --name-only "${old_release_tag}" src/lib | cut -d '/' -f 3
 done
 
 if ! ${is_new_tag_stable_release} && ${is_old_tag_stable_release}; then
-  for lib in $(find 'src/lib' -mindepth 1 -maxdepth 1 -type d | cut -d '/' -f 3 | sort -uV); do
+  for lib in $(find 'src/lib' -type d | cut -d '/' -f 3- | grep -v test | sed "s/\/[^\/]*$//" | sort -uV); do
     # Skip over files and anything that is not a directory.
     if test ! -d "src/lib/${lib}"; then
       continue
     fi
+    # Skip over directories that do not contain Makefile.am.
+    if test ! -f "src/lib/${lib}/Makefile.am"; then
+      continue
+    fi
 
     old_version=$(grep -- '-version-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
     new_version=$((old_version + increment_extra))