[#3731] Address review

diff --git a/config-report.sh.in b/config-report.sh.in
index a1f2001141036b4fef50fdd56a90aacbf2862dfa..0e647c49f47f3f31f59b6f64cbbf2b606522f386 100755 (executable)
--- a/config-report.sh.in
+++ b/config-report.sh.in
@@ -32,7 +32,7 @@ C++ Compiler:
 
 END
 
-if test "@HAVE_PYTHON@" != "no" ; then
+if test '@HAVE_PYTHON@' != 'no'; then
 cat >> @TOP_BUILD_DIR@/config.report << END
 Python:
   PYTHON:          @PYTHON_PATH@
@@ -63,7 +63,7 @@ Flex/bison:
 
 END
 
-if test "@HAVE_MYSQL@" != "no" ; then
+if test '@HAVE_MYSQL@' != 'no'; then
 cat >> @TOP_BUILD_DIR@/config.report << END
 MySQL:
   MYSQL_VERSION:   @MYSQL_VERSION@
@@ -79,7 +79,7 @@ MySQL:
 END
 fi
 
-if test "@HAVE_PGSQL@" != "no" ; then
+if test '@HAVE_PGSQL@' != 'no'; then
 cat >> @TOP_BUILD_DIR@/config.report << END
 PostgreSQL:
   PGSQL_VERSION:   @PGSQL_VERSION@
@@ -101,7 +101,7 @@ NETCONF:
 
 END
 
-if test "@HAVE_GTEST@" != "no" ; then
+if test '@HAVE_GTEST@' != 'no'; then
 cat >> @TOP_BUILD_DIR@/config.report << END
 Google Test:
   GTEST_VERSION:   @GTEST_VERSION@

diff --git a/doc/devel/meson.build b/doc/devel/meson.build
index 53b52ebbfa6b403383d4e7dce953c25b71cb5265..06aa783f345d34f35c494bd73fbceaa706cb9a57 100644 (file)
--- a/doc/devel/meson.build
+++ b/doc/devel/meson.build
@@ -6,7 +6,7 @@ current_build_dir = meson.current_build_dir()
 current_source_dir = meson.current_source_dir()
 make_devel_conf_data = configuration_data()
 make_devel_conf_data.set('builddir', current_build_dir)
-make_devel_conf_data.set('PACKAGE_VERSION', project_version)
+make_devel_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 configure_file(
     input: 'make-devel.sh.in',
     output: 'make-devel.sh',

diff --git a/doc/make-grammar.sh.in b/doc/make-grammar.sh.in
index ea17aef7be6918620ebb2f8270f12647b9622b2c..94a76bdd2ed47100109d514827b08380113a2111 100755 (executable)
--- a/doc/make-grammar.sh.in
+++ b/doc/make-grammar.sh.in
@@ -5,7 +5,7 @@
 
 set -euv
 
-cd @TOP_SOURCE_DIR@
+cd '@TOP_SOURCE_DIR@'
 
 extract_bnf="@TOP_BUILD_DIR@/tools/extract_bnf.sh"
 

diff --git a/doc/sphinx/make-doc.sh.in b/doc/sphinx/make-doc.sh.in
index a1a719b8726eb5ba4fbcc1df136d8afa84b2b10e..723b3726455f5ad137690bbd7074f7899be07421 100755 (executable)
--- a/doc/sphinx/make-doc.sh.in
+++ b/doc/sphinx/make-doc.sh.in
@@ -2,18 +2,18 @@
 
 set -euv
 
-cd @builddir@
+cd '@builddir@'
 
 # api.rst is always generated via sphinx's conf.py
 @PYTHON@ @srcdir@/api2doc.py -o @srcdir@/api.rst
 
-rm -f @srcdir@/arm/platforms.rst
-cp @TOP_SOURCE_DIR@/platforms.rst @srcdir@/arm/platforms.rst
+rm -f '@srcdir@/arm/platforms.rst'
+cp '@TOP_SOURCE_DIR@/platforms.rst' '@srcdir@/arm/platforms.rst'
 
 # pdf
-if test "@HAVE_PDFLATEX@" != "no" ; then
+if test '@HAVE_PDFLATEX@' != 'no'; then
     @SPHINXBUILD@ -M latex @srcdir@ @sphinxbuilddir@ @sphinxopts@
-    cd @abs_sphinxbuilddir@/latex
+    cd '@abs_sphinxbuilddir@/latex'
     @PDFLATEX_AND_OPTS@ kea-arm.tex
     makeindex -s python.ist kea-arm.idx
     @PDFLATEX_AND_OPTS@ kea-arm.tex
@@ -22,7 +22,7 @@ if test "@HAVE_PDFLATEX@" != "no" ; then
     @PDFLATEX_AND_OPTS@ kea-messages.tex
 fi
 
-cd @builddir@
+cd '@builddir@'
 
 # html
 @SPHINXBUILD@ -M html @srcdir@ @sphinxbuilddir@ @sphinxopts@

diff --git a/doc/sphinx/make-install.sh.in b/doc/sphinx/make-install.sh.in
index 99f79428f155ae5702e3e1983d7cdb80cf34c73c..0a516b18f105c974eaba44dfb9eba26d37e2a518 100755 (executable)
--- a/doc/sphinx/make-install.sh.in
+++ b/doc/sphinx/make-install.sh.in
@@ -3,9 +3,9 @@
 set -euv
 
 mkdir -p @docdir@
-if test -d "@abs_sphinxbuilddir@/html" ; then
+if test -d '@abs_sphinxbuilddir@/html'; then
     cp -r @abs_sphinxbuilddir@/html @docdir@
-    if test "@HAVE_PDFLATEX@" != "no" ; then
+    if test '@HAVE_PDFLATEX@' != 'no'; then
         @INSTALL@ -c -m 644 @abs_sphinxbuilddir@/latex/kea-arm.pdf @docdir@
         @INSTALL@ -c -m 644 @abs_sphinxbuilddir@/latex/kea-messages.pdf @docdir@
     fi

diff --git a/doc/sphinx/make-mes-doc.sh.in b/doc/sphinx/make-mes-doc.sh.in
index e4383a0e603c12931f70e5c1b6cc7370c69f7f42..28a1ef96454e6fa4c7417834fe66aa590b0af494 100755 (executable)
--- a/doc/sphinx/make-mes-doc.sh.in
+++ b/doc/sphinx/make-mes-doc.sh.in
@@ -2,7 +2,7 @@
 
 set -euv
 
-cd @TOP_SOURCE_DIR@
+cd '@TOP_SOURCE_DIR@'
 
 # api-files.txt
 find src/share/api -type f -name '[a-z]*.json' | sort -V > "@srcdir@/api-files.txt"
@@ -14,5 +14,5 @@ find . -type f -name '*.mes' | sort -V | sed 's#^./##g' > "@srcdir@/mes-files.tx
 @PYTHON@ ./tools/check-messages.py --generate-debug-messages-page
 
 # kea-messages.rst
-cd @srcdir@
+cd '@srcdir@'
 @PYTHON@ ./mes2doc.py -o kea-messages.rst

diff --git a/doc/sphinx/make-uml.sh.in b/doc/sphinx/make-uml.sh.in
index 91ff8f7cdfa6a821e887af440a9956ed80304a4e..b4b49f3a4b768414eb597bd16d0cba1de7224885 100755 (executable)
--- a/doc/sphinx/make-uml.sh.in
+++ b/doc/sphinx/make-uml.sh.in
@@ -2,9 +2,9 @@
 
 set -euv
 
-cd @srcdir@
+cd '@srcdir@'
 
-if test "@HAVE_PLANTUML@" = "no" ; then
+if test '@HAVE_PLANTUML@' = 'no'; then
     exit 0
 fi
 
@@ -15,7 +15,7 @@ for uml in @umls@; do @PLANTUML@ -tpng "$uml"; done
 # shellcheck disable=SC2043
 for uml in @umls@; do @PLANTUML@ -tsvg "$uml"; done
 # format-svgs
-if test "@HAVE_XMLLINT" != "no" ; then
+if test '@HAVE_XMLLINT' != 'no'; then
     # shellcheck disable=SC2043
     for svg in @svgs@; do xmllint --format "$svg" > tmp; mv tmp "$svg"; done
 else

diff --git a/doc/sphinx/make-update-python-dependencies.sh.in b/doc/sphinx/make-update-python-dependencies.sh.in
index 7b3f2eaf7dc6f8f55e5491d2a8e4d5a8cb5c7a33..dc5270a28de7275e43b0d1e0fbbf8db1dd077505 100755 (executable)
--- a/doc/sphinx/make-update-python-dependencies.sh.in
+++ b/doc/sphinx/make-update-python-dependencies.sh.in
@@ -2,10 +2,9 @@
 
 set -euv
 
-if test "@HAVE_PIP_COMPILE@" = "no" ; then
+if test '@HAVE_PIP_COMPILE@' = 'no'; then
     exit 0
 fi
 
-cd @srcdir@
-rm -f ./src/requirements.txt
-pip-compile -r ./src/requirements.in
+cd '@srcdir@'
+@PIP_COMPILE@ --no-strip-extras --rebuild --upgrade ./src/requirements.in

diff --git a/doc/sphinx/meson.build b/doc/sphinx/meson.build
index 0f5072c70dbb549d01c2fe7e0ea3ad4467ecb2b3..ec2c3772aebf4403ea757d6b3fe0ba2f1926e3c1 100644 (file)
--- a/doc/sphinx/meson.build
+++ b/doc/sphinx/meson.build
@@ -111,8 +111,10 @@ make_conf_data.set('tumls', ' '.join(tumls))
 make_conf_data.set('txts', ' '.join(txts))
 if PIP_COMPILE.found()
     make_conf_data.set('HAVE_PIP_COMPILE', 'yes')
+    make_conf_data.set('PIP_COMPILE', PIP_COMPILE.full_path())
 else
     make_conf_data.set('HAVE_PIP_COMPILE', 'no')
+    make_conf_data.set('PIP_COMPILE', 'pip-compile')
 endif
 make_conf_data.set('man8s', ' '.join(man8s))
 make_conf_data.set('PREFIX', PREFIX)

diff --git a/meson.build b/meson.build
index aeb92d752eddf01505ef5998804555be12698172..554284071b20b897db7f34f1ba4737f3912e9b99 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
 project('kea', 'cpp', version: '2.7.7-git', meson_version: '>=0.64.0')
 
 cpp = meson.get_compiler('cpp')
-project_version = meson.project_version()
+PROJECT_VERSION = meson.project_version()
 
 #### Imports
 
@@ -99,17 +99,17 @@ conf_data = configuration_data(
         # 'PACKAGE': 'kea',
         # 'PACKAGE_BUGREPORT': 'kea-dev@lists.isc.org',
         'PACKAGE_NAME': 'kea',
-        # 'PACKAGE_STRING': f'kea "@project_version@"',
+        # 'PACKAGE_STRING': f'kea "@PROJECT_VERSION@"',
         # 'PACKAGE_TARNAME': 'kea',
         # 'PACKAGE_URL': '',
-        'PACKAGE_VERSION': meson.project_version(),
+        'PACKAGE_VERSION': PROJECT_VERSION,
         'PACKAGE_VERSION_TYPE': '"development"',
         # 'PREMIUM': false,
         # 'PREMIUM_EXTENDED_VERSION': '"no"',
         # 'STDC_HEADERS': false,
         # 'TOP_BUILDDIR': false,
         # 'USE_STATIC_LINK': false,
-        'VERSION': f'"@project_version@"',
+        'VERSION': f'"@PROJECT_VERSION@"',
         # 'WITH_HEIMDAL': false,
         # 'YYTEXT_POINTER': false,
         # 'SIZE_T': 'size_t',
@@ -400,14 +400,17 @@ conf_data.set('HAVE_STREAM_TRUNCATED_ERROR', result.returncode() == 0)
 
 compile_args = []
 link_args = []
+
+# $ORIGIN documented at https://www.man7.org/linux/man-pages/man8/ld.so.8.html
+rpath = '$ORIGIN/../lib'
 if SYSTEM == 'darwin'
     compile_args += ['-D__APPLE_USE_RFC_3542']
     add_project_arguments('-D__APPLE_USE_RFC_3542', language: 'cpp')
-    link_arg = '-Wl,-rpath,$ORIGIN/../lib'
+    link_arg = f'-Wl,-rpath,@rpath@'
     link_args += [link_arg]
     add_project_link_arguments(link_arg, language: 'cpp')
 else
-    link_arg = '-Wl,-rpath=$ORIGIN/../lib'
+    link_arg = f'-Wl,-rpath=@rpath@'
     link_args += [link_arg]
     add_project_link_arguments(link_arg, language: 'cpp')
 endif
@@ -415,7 +418,7 @@ endif
 have_premium = fs.is_dir('premium')
 if have_premium
     conf_data.set('PREMIUM', 'yes')
-    conf_data.set('PREMIUM_EXTENDED_VERSION', f'"@project_version@"')
+    conf_data.set('PREMIUM_EXTENDED_VERSION', f'"@PROJECT_VERSION@"')
 else
     conf_data.set('PREMIUM', 'no')
     conf_data.set('PREMIUM_EXTENDED_VERSION', '"no"')
@@ -435,8 +438,8 @@ INCLUDES = [
 report_conf_data = configuration_data()
 report_conf_data.set('TOP_BUILD_DIR', TOP_BUILD_DIR)
 report_conf_data.set('PACKAGE_NAME', 'kea')
-report_conf_data.set('PACKAGE_VERSION', project_version)
-report_conf_data.set('EXTENDED_VERSION', project_version + ' (tarball)')
+report_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
+report_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
 report_conf_data.set('PACKAGE_VERSION_TYPE', 'development')
 report_conf_data.set('OS_TYPE', OS_TYPE)
 report_conf_data.set('PREFIX', PREFIX)

diff --git a/src/bin/admin/meson.build b/src/bin/admin/meson.build
index cfeb1f4df3dcd6d40234bb93f082be2a0724a839..a3dd6e98f5a7ab7fe0f81e49e5b74ec99e489d6e 100644 (file)
--- a/src/bin/admin/meson.build
+++ b/src/bin/admin/meson.build
@@ -5,8 +5,8 @@ datadir = get_option('datadir')
 kea_admin_conf_data.set('datarootdir', '${prefix}/' + datadir)
 kea_admin_conf_data.set('PACKAGE', 'kea')
 kea_admin_conf_data.set('PACKAGE_NAME', 'kea')
-kea_admin_conf_data.set('PACKAGE_VERSION', project_version)
-kea_admin_conf_data.set('EXTENDED_VERSION', project_version + ' (tarball)')
+kea_admin_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
+kea_admin_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
 kea_admin_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
 kea_admin_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR)
 kea_admin_conf_data.set('sbindir', '${prefix}/' + get_option('sbindir'))

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index 4c8e8d334e97b6d469f649991c20a2f9fb4b08ad..85721d0b14e8ba6a01ba3a132674ee01139b5068 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -9,8 +9,8 @@ if NETCONF_DEPS_FOUND
 else
     keactrl_conf_data.set('HAVE_NETCONF', 'no')
 endif
-keactrl_conf_data.set('EXTENDED_VERSION', project_version + ' (tarball)')
-keactrl_conf_data.set('PACKAGE_VERSION', project_version)
+keactrl_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
+keactrl_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 keactrl_conf_data.set('runstatedir', '${prefix}/' + RUN_STATE_DIR + '/run')
 keactrl_conf_data.set('localstatedir', '${prefix}/' + RUN_STATE_DIR)
 kea_configfiles_destdir = f'@SYSCONFDIR@/kea'

diff --git a/src/bin/keactrl/tests/meson.build b/src/bin/keactrl/tests/meson.build
index 8aad4f9b30bd240a9c2fba9158119a6def5e5af9..8fb0cb6718438fb2d41e64c2824291e18d83d80d 100644 (file)
--- a/src/bin/keactrl/tests/meson.build
+++ b/src/bin/keactrl/tests/meson.build
@@ -9,7 +9,7 @@ if NETCONF_DEPS_FOUND
 else
     keactrl_tests_conf_data.set('HAVE_NETCONF', 'no')
 endif
-keactrl_tests_conf_data.set('PACKAGE_VERSION', project_version)
+keactrl_tests_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 configure_file(
     input: 'keactrl_tests.sh.in',
     output: 'keactrl_tests.sh',

diff --git a/src/bin/shell/meson.build b/src/bin/shell/meson.build
index 26f0047de211b71e5a957cec86dea388f9856d3b..0cd9c865aaa32ebaef7abfd4af38b26a63bde7c0 100644 (file)
--- a/src/bin/shell/meson.build
+++ b/src/bin/shell/meson.build
@@ -4,8 +4,8 @@ endif
 
 kea_shell_conf_data = configuration_data()
 kea_shell_conf_data.set('PYTHON', PYTHON.full_path())
-kea_shell_conf_data.set('PACKAGE_VERSION', project_version)
-kea_shell_conf_data.set('EXTENDED_VERSION', project_version + ' (tarball)')
+kea_shell_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
+kea_shell_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
 
 r = run_command(
     PYTHON,

diff --git a/src/lib/testutils/meson.build b/src/lib/testutils/meson.build
index 586497cd66f0d445a41f85cfe2b7c2431e6ba3ba..0e3e494997056a8edd79a34278f9cfd16220a3ba 100644 (file)
--- a/src/lib/testutils/meson.build
+++ b/src/lib/testutils/meson.build
@@ -17,7 +17,7 @@ kea_testutils_lib = static_library(
 dhcp_test_lib_conf_data = configuration_data()
 dhcp_test_lib_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
 dhcp_test_lib_conf_data.set('prefix', PREFIX)
-dhcp_test_lib_conf_data.set('PACKAGE_VERSION', project_version)
+dhcp_test_lib_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 dhcp_test_lib_conf_data.set('dotlibs', '')
 configure_file(
     input: 'dhcp_test_lib.sh.in',