X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=976cb19050e75a5144c1fd3e3c156f579759a732;hb=3ffe6cadf;hp=90ed59f11c0e780985cb8ed8ffe9befb24dd6402;hpb=e4218be67141311e8999059d7f848af4c2c311df;p=vpp.git diff --git a/Makefile b/Makefile index 90ed59f11c0..976cb19050e 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev DEB_DEPENDS += python-all python3-all python3-setuptools python-dev DEB_DEPENDS += python-virtualenv python-pip libffi6 check DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev -DEB_DEPENDS += cmake ninja-build uuid-dev +DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += libssl-dev else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) @@ -94,7 +94,7 @@ ifeq ($(OS_ID),fedora) RPM_DEPENDS += subunit subunit-devel RPM_DEPENDS += compat-openssl10-devel RPM_DEPENDS += python3-devel python3-ply - RPM_DEPENDS += python3-virtualenv + RPM_DEPENDS += python3-virtualenv python3-jsonschema RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' else @@ -102,7 +102,7 @@ else RPM_DEPENDS += openssl-devel RPM_DEPENDS += python-devel python36-ply RPM_DEPENDS += python36-devel python36-pip - RPM_DEPENDS += python-virtualenv + RPM_DEPENDS += python-virtualenv python36-jsonschema RPM_DEPENDS += devtoolset-7 RPM_DEPENDS += cmake3 RPM_DEPENDS_GROUPS = 'Development Tools' @@ -216,6 +216,8 @@ help: @echo " doxygen - (re)generate documentation" @echo " bootstrap-doxygen - setup Doxygen dependencies" @echo " wipe-doxygen - wipe all generated documentation" + @echo " checkfeaturelist - check FEATURE.yaml according to schema" + @echo " featurelist - dump feature list in markdown" @echo " docs - Build the Sphinx documentation" @echo " docs-venv - Build the virtual environment for the Sphinx docs" @echo " docs-clean - Remove the generated files from the Sphinx docs" @@ -224,6 +226,7 @@ help: @echo " test-cov - generate code coverage report for test framework" @echo " test-wipe-cov - wipe code coverage report for test framework" @echo " test-checkstyle - check PEP8 compliance for test framework" + @echo " test-refresh-deps - refresh the Python dependencies for the tests" @echo "" @echo "Make Arguments:" @echo " V=[0|1] - set build verbosity level" @@ -443,7 +446,7 @@ test-wipe-doc: @make -C test wipe-doc test-cov: - @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install japi-install + @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_gcov,cov) @@ -453,6 +456,9 @@ test-wipe-cov: test-checkstyle: @make -C test checkstyle +test-refresh-deps: + @make -C test refresh-deps + retest: $(call test,vpp,vpp,retest) @@ -544,6 +550,12 @@ checkstyle: fixstyle: @build-root/scripts/checkstyle.sh --fix +featurelist: + @build-root/scripts/fts.py --all --markdown + +checkfeaturelist: + @build-root/scripts/fts.py --validate --git-status + # # Build the documentation #