python: meson constants.py template moved to knot_resolver module

diff --git a/meson.build b/meson.build
index 85c69fa79eaf23de33c92abd0b31a63d3055da8c..82035cecc4125c73c3ae9fc8a1b8e4785fd5a127 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -275,7 +275,7 @@ subdir('lib')
 ## Remaining code
 subdir('daemon')
 subdir('modules')
-subdir('python')
+subdir('python' / 'knot_resolver')
 subdir('utils')
 if get_option('bench') == 'enabled'
   subdir('bench')

diff --git a/python/constants.py.in b/python/knot_resolver/constants.py.in
similarity index 100%
rename from python/constants.py.in
rename to python/knot_resolver/constants.py.in

diff --git a/python/meson.build b/python/knot_resolver/meson.build
similarity index 100%
rename from python/meson.build
rename to python/knot_resolver/meson.build

diff --git a/scripts/poe-tasks/check b/scripts/poe-tasks/check
index 7acd65b717129ff8ce9e52e1d67e8db37b45a46f..8cae7fdc9b5b6723e0c8efd0baa3a711e2f23a28 100755 (executable)
--- a/scripts/poe-tasks/check
+++ b/scripts/poe-tasks/check
@@ -71,7 +71,7 @@ echo
 # check python/knot_resolver/constants.py
 echo -e "${yellow}python/knot_resolver/constants.py${reset}"
 meson_setup_configure > /dev/null
-diff python/knot_resolver/constants.py $build_dir/python/constants.py
+diff python/knot_resolver/constants.py $build_dir/python/knot_resolver/constants.py
 check_rv $?
 echo
 

diff --git a/scripts/poe-tasks/configure b/scripts/poe-tasks/configure
index 8e4fff066b03c6db136eb65cadd15839e44ce68e..dc4aa0748f9d78a88bd9f04b7bfe40768ff27855 100755 (executable)
--- a/scripts/poe-tasks/configure
+++ b/scripts/poe-tasks/configure
@@ -10,5 +10,5 @@ echo
 echo -----------------------------------------------
 echo Copying constants.py module configured by Meson
 echo -----------------------------------------------
-cp -v $build_dev_dir/python/constants.py $gitroot/python/knot_resolver/constants.py
+cp -v $build_dev_dir/python/knot_resolver/constants.py $gitroot/python/knot_resolver/constants.py
 echo

diff --git a/scripts/poe-tasks/doc-schema b/scripts/poe-tasks/doc-schema
index ff7dea46973c4c53365b2a56fe07a5ff25835c4d..33ea3bd6d6dcc645cd77a38ee3dd313d3d6bc4a0 100755 (executable)
--- a/scripts/poe-tasks/doc-schema
+++ b/scripts/poe-tasks/doc-schema
@@ -7,7 +7,7 @@ source $src_dir/utils/_env.sh
 schema_file="$gitroot/doc/_static/config.schema.json"
 
 meson_setup_configure > /dev/null
-cp $build_dir/python/constants.py $gitroot/python/knot_resolver/constants.py
+cp $build_dir/python/knot_resolver/constants.py $gitroot/python/knot_resolver/constants.py
 python -m knot_resolver.client schema > $schema_file
 
 echo New configuration JSON schem saved to $schema_file
\ No newline at end of file

diff --git a/scripts/poe-tasks/gen-constantspy b/scripts/poe-tasks/gen-constantspy
index f71f157751983f4bac922e87a19b5f4cabb737e7..0f3bb3b68bfdaff20bc0d3e393512b639dfd646b 100755 (executable)
--- a/scripts/poe-tasks/gen-constantspy
+++ b/scripts/poe-tasks/gen-constantspy
@@ -10,5 +10,5 @@ echo
 echo -----------------------------------------------
 echo Copying constants.py module configured by Meson
 echo -----------------------------------------------
-cp -v $build_dir/python/constants.py $gitroot/python/knot_resolver/constants.py
+cp -v $build_dir/python/knot_resolver/constants.py $gitroot/python/knot_resolver/constants.py
 echo
\ No newline at end of file