summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-06-26 21:13:43 +0200
committerChristian Breunig <christian@breunig.cc>2024-06-26 21:47:09 +0200
commit9473800055e0e1e9833f4a41c6d5d5a8a0d27399 (patch)
tree5301252a4b24643cc28d8b55a004c5f21b774b40 /Makefile
parent6890cd7b0f2419d6b1a720d892f9a7d07b7cfd05 (diff)
downloadvyos-1x-9473800055e0e1e9833f4a41c6d5d5a8a0d27399.tar.gz
vyos-1x-9473800055e0e1e9833f4a41c6d5d5a8a0d27399.zip
vyos-configd: T6510: autogenerate configd-include.json
Now that there is a build time validation that Config() is not instantiated twice in a config mode script, and also as there are no more direct calls on the my_set and my_delete binary, we can auto generate the list of helpers run by vyos-configd.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 6 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 509b47858..1e0a12714 100644
--- a/Makefile
+++ b/Makefile
@@ -78,18 +78,7 @@ vyshim:
$(MAKE) -C $(SHIM_DIR)
.PHONY: all
-all: clean interface_definitions op_mode_definitions check test j2lint vyshim check_migration_scripts_executable
-
-.PHONY: check
-.ONESHELL:
-check:
- @echo "Checking which CLI scripts are not enabled to work with vyos-configd..."
- @for file in `ls src/conf_mode -I__pycache__`
- do
- if ! grep -q $$file data/configd-include.json; then
- echo "* $$file"
- fi
- done
+all: clean interface_definitions op_mode_definitions test j2lint vyshim check_migration_scripts_executable generate-configd-include-json
.PHONY: clean
clean:
@@ -99,7 +88,7 @@ clean:
$(MAKE) -C $(SHIM_DIR) clean
.PHONY: test
-test:
+test: generate-configd-include-json
set -e; python3 -m compileall -q -x '/vmware-tools/scripts/, /ppp/' .
PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators,src/tests --verbose
@@ -127,6 +116,10 @@ unused-imports:
deb:
dpkg-buildpackage -uc -us -tc -b
+.PHONY: generate-configd-include-json
+generate-configd-include-json:
+ @scripts/generate-configd-include-json.py
+
.PHONY: schema
schema:
trang -I rnc -O rng schema/interface_definition.rnc schema/interface_definition.rng