From 1e7296497f43e39b12714e9be7f61d7ba3b4e3e4 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 4 Nov 2018 16:52:13 +0100 Subject: [PATCH] make: style now checks PHP and Python for build test --- Makefile | 8 +++++--- README.md | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f823dc32e..354c91509 100644 --- a/Makefile +++ b/Makefile @@ -309,7 +309,10 @@ sweep: STYLEDIRS?= src/etc/inc/plugins.inc.d src/opnsense -style: want-php${CORE_PHP}-pear-PHP_CodeSniffer +style-python: want-py${CORE_PYTHON2}-pycodestyle + @pycodestyle --ignore=E501 ${.CURDIR}/src || true + +style-php: want-php${CORE_PHP}-pear-PHP_CodeSniffer @: > ${WRKDIR}/style.out .for STYLEDIR in ${STYLEDIRS} @(phpcs --standard=ruleset.xml ${.CURDIR}/${STYLEDIR} \ @@ -327,8 +330,7 @@ style-fix: want-php${CORE_PHP}-pear-PHP_CodeSniffer phpcbf --standard=ruleset.xml ${.CURDIR}/${STYLEDIR} || true .endfor -style-python: want-py${CORE_PYTHON2}-pycodestyle - @pycodestyle --ignore=E501 ${.CURDIR}/src || true +style: style-python style-php license: want-p5-File-Slurp @${.CURDIR}/Scripts/license > ${.CURDIR}/LICENSE diff --git a/README.md b/README.md index 3f9b12d05..19de1134c 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,8 @@ before issuing a pull request on GitHub. make style ---------- -Run the CodeSniffer PSR2 style checks on the MVC code base. +Run the PSR2 and PEP8 style checks on MVC PHP code and Python, +respectively. make sweep ----------