diff --git a/Makefile b/Makefile index b8928dbc9..981c92f2a 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ list: .endfor # shared targets that are sane to run from the root directory -TARGETS= clean glint lint plist-fix revision style style-fix style-python sweep test +TARGETS= clean glint lint plist-fix revision style style-fix style-model style-python sweep test .for TARGET in ${TARGETS} ${TARGET}: diff --git a/Mk/plugins.mk b/Mk/plugins.mk index 050472627..98e6cd835 100644 --- a/Mk/plugins.mk +++ b/Mk/plugins.mk @@ -453,12 +453,16 @@ style-python: check fi style-model: - @for MODEL in $$(find ${.CURDIR}/src/opnsense/mvc/app/models -depth 3 \ - -name "*.xml"); do \ - perl -i -pe 's/(.*?)<\/default>/$$1<\/Default>/g' $${MODEL}; \ - perl -i -pe 's/(.*?)<\/multiple>/$$1<\/Multiple>/g' $${MODEL}; \ - perl -i -pe 's/(.*?)<\/required>/$$1<\/Required>/g' $${MODEL}; \ - done + @if [ -d ${.CURDIR}/src/opnsense/mvc/app/models ]; then \ + for MODEL in $$(find ${.CURDIR}/src/opnsense/mvc/app/models -depth 3 \ + -name "*.xml"); do \ + perl -i -pe 's/(.*?)<\/default>/$$1<\/Default>/g' $${MODEL}; \ + perl -i -pe 's/(.*?)<\/multiple>/$$1<\/Multiple>/g' $${MODEL}; \ + perl -i -pe 's/(.*?)<\/required>/$$1<\/Required>/g' $${MODEL}; \ + perl -i -pe 's/(.*?)<\/mask>/$$1<\/Mask>/g' $${MODEL}; \ + perl -i -pe 's/(.*?)<\/asList>/$$1<\/AsList>/g' $${MODEL}; \ + done; \ + fi test: check @if [ -d ${.CURDIR}/src/opnsense/mvc/tests ]; then \