From 9f70c6e5ffa3ec8a5354d101fa05353f739c23db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20Mr=C3=A1zek?= Date: Thu, 19 Sep 2024 15:43:30 +0200 Subject: [PATCH] python: meson constants.py template moved to knot_resolver module --- meson.build | 2 +- python/{ => knot_resolver}/constants.py.in | 0 python/{ => knot_resolver}/meson.build | 0 scripts/poe-tasks/check | 2 +- scripts/poe-tasks/configure | 2 +- scripts/poe-tasks/doc-schema | 2 +- scripts/poe-tasks/gen-constantspy | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename python/{ => knot_resolver}/constants.py.in (100%) rename python/{ => knot_resolver}/meson.build (100%) diff --git a/meson.build b/meson.build index 85c69fa79..82035cecc 100644 --- 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 7acd65b71..8cae7fdc9 100755 --- 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 8e4fff066..dc4aa0748 100755 --- 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 ff7dea469..33ea3bd6d 100755 --- 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 f71f15775..0f3bb3b68 100755 --- 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 -- 2.47.2