Commit 3ecf0b8a authored by Franco Fichtner's avatar Franco Fichtner

make: add want- helper, also need phpunit soon

parent 610013dc
...@@ -155,7 +155,13 @@ CORE_DEPENDS?= apinger \ ...@@ -155,7 +155,13 @@ CORE_DEPENDS?= apinger \
wol \ wol \
zip zip
manifest: force want-git: force
@${PKG} info git > /dev/null
want-pear-PHP_CodeSniffer: force
@${PKG} info pear-PHP_CodeSniffer > /dev/null
manifest: want-git
@echo "name: \"${CORE_NAME}\"" @echo "name: \"${CORE_NAME}\""
@echo "version: \"${CORE_VERSION}\"" @echo "version: \"${CORE_VERSION}\""
@echo "origin: \"${CORE_ORIGIN}\"" @echo "origin: \"${CORE_ORIGIN}\""
...@@ -222,7 +228,6 @@ package: force ...@@ -222,7 +228,6 @@ package: force
echo ">>> Missing required file(s). Please run 'make package-keywords'" >&2; \ echo ">>> Missing required file(s). Please run 'make package-keywords'" >&2; \
exit 1; \ exit 1; \
fi fi
@${PKG} info git > /dev/null
@rm -rf ${WRKSRC} ${PKGDIR} @rm -rf ${WRKSRC} ${PKGDIR}
@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install @${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install
@${MAKE} DESTDIR=${WRKSRC} scripts @${MAKE} DESTDIR=${WRKSRC} scripts
...@@ -258,7 +263,7 @@ sweep: force ...@@ -258,7 +263,7 @@ sweep: force
find ${.CURDIR}/scripts -type f -print0 | \ find ${.CURDIR}/scripts -type f -print0 | \
xargs -0 -n1 scripts/cleanfile xargs -0 -n1 scripts/cleanfile
style: force style: want-pear-PHP_CodeSniffer
@(phpcs --tab-width=4 --standard=PSR2 ${.CURDIR}/src/opnsense/mvc \ @(phpcs --tab-width=4 --standard=PSR2 ${.CURDIR}/src/opnsense/mvc \
|| true) > ${.CURDIR}/.style.out || true) > ${.CURDIR}/.style.out
@echo -n "Total number of style warnings: " @echo -n "Total number of style warnings: "
...@@ -268,7 +273,7 @@ style: force ...@@ -268,7 +273,7 @@ style: force
@cat ${.CURDIR}/.style.out @cat ${.CURDIR}/.style.out
@rm ${.CURDIR}/.style.out @rm ${.CURDIR}/.style.out
stylefix: force stylefix: want-pear-PHP_CodeSniffer
phpcbf --standard=PSR2 ${.CURDIR}/src/opnsense/mvc || true phpcbf --standard=PSR2 ${.CURDIR}/src/opnsense/mvc || true
setup: force setup: force
...@@ -278,7 +283,7 @@ health: force ...@@ -278,7 +283,7 @@ health: force
# check test script output and advertise a failure... # check test script output and advertise a failure...
[ "`${.CURDIR}/src/etc/rc.php_test_run`" == "FCGI-PASSED PASSED" ] [ "`${.CURDIR}/src/etc/rc.php_test_run`" == "FCGI-PASSED PASSED" ]
clean: clean: want-git
${GIT} reset --hard HEAD && ${GIT} clean -xdqf . ${GIT} reset --hard HEAD && ${GIT} clean -xdqf .
.PHONY: force .PHONY: force
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment