Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
sctp: move to plugins, disabled by default
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
8a1eaa2
..
976cb19
100644
(file)
--- 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 += 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)
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 += 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
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 += 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'
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 " 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"
@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-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"
@echo ""
@echo "Make Arguments:"
@echo " V=[0|1] - set build verbosity level"
@@
-321,6
+324,7
@@
else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
else
$(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems")
endif
else
$(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems")
endif
+ git config commit.template .git_commit_template.txt
define make
@make -C $(BR) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
define make
@make -C $(BR) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
@@
-442,7
+446,7
@@
test-wipe-doc:
@make -C test wipe-doc
test-cov:
@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)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_gcov,cov)
@@
-452,6
+456,9
@@
test-wipe-cov:
test-checkstyle:
@make -C test checkstyle
test-checkstyle:
@make -C test checkstyle
+test-refresh-deps:
+ @make -C test refresh-deps
+
retest:
$(call test,vpp,vpp,retest)
retest:
$(call test,vpp,vpp,retest)
@@
-543,6
+550,12
@@
checkstyle:
fixstyle:
@build-root/scripts/checkstyle.sh --fix
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
#
#
# Build the documentation
#