diff options
Diffstat (limited to 'build/build.xml')
| -rw-r--r-- | build/build.xml | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/build/build.xml b/build/build.xml index ec94cf3ea6..f2668e2101 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.1.0-b5-dev" /> - <property name="prevversion" value="3.1.0-b4" /> - <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3" /> + <property name="newversion" value="3.1.0-RC2-dev" /> + <property name="prevversion" value="3.1.0-RC1" /> + <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> @@ -77,29 +77,38 @@ <exec command="phpBB/vendor/bin/phpcs -s --extensions=php - --standard=build/code_sniffer/ruleset-php-strict.xml - --ignore=phpBB/phpbb/db/migration/data/v30x/* + --standard=build/code_sniffer/ruleset-php-strict-core.xml + --ignore=${project.basedir}/phpBB/phpbb/db/migration/data/v30x/* phpBB/phpbb" dir="." returnProperty="retval-php-strict" passthru="true" /> <exec command="phpBB/vendor/bin/phpcs -s --extensions=php - --standard=build/code_sniffer/ruleset-php-legacy.xml - --ignore=phpBB/cache/* - --ignore=phpBB/develop/* - --ignore=phpBB/includes/diff/*.php - --ignore=phpBB/includes/sphinxapi.php - --ignore=phpBB/includes/utf/data/* - --ignore=phpBB/install/data/* - --ignore=phpBB/install/database_update.php - --ignore=phpBB/phpbb/* - --ignore=phpBB/vendor/* + --standard=build/code_sniffer/ruleset-php-legacy-core.xml + --ignore=${project.basedir}/phpBB/cache/* + --ignore=${project.basedir}/phpBB/develop/* + --ignore=${project.basedir}/phpBB/ext/* + --ignore=${project.basedir}/phpBB/includes/diff/*.php + --ignore=${project.basedir}/phpBB/includes/sphinxapi.php + --ignore=${project.basedir}/phpBB/includes/utf/data/* + --ignore=${project.basedir}/phpBB/install/data/* + --ignore=${project.basedir}/phpBB/install/database_update.php + --ignore=${project.basedir}/phpBB/phpbb/* + --ignore=${project.basedir}/phpBB/vendor/* phpBB" dir="." returnProperty="retval-php-legacy" passthru="true" /> + <exec command="phpBB/vendor/bin/phpcs + -s + --extensions=php + --standard=build/code_sniffer/ruleset-php-extensions.xml + --ignore=${project.basedir}/phpBB/ext/*/tests/* + phpBB/ext" + dir="." returnProperty="retval-php-ext" passthru="true" /> <if> <or> <not><equals arg1="${retval-php-strict}" arg2="0" /></not> <not><equals arg1="${retval-php-legacy}" arg2="0" /></not> + <not><equals arg1="${retval-php-ext}" arg2="0" /></not> </or> <then> <fail message="PHP Code Sniffer failed." /> |