Page MenuHomeIn-Portal Phabricator

D469.diff
No OneTemporary

File Metadata

Created
Mon, Jan 6, 5:33 AM

D469.diff

Index: branches/5.2.x/tools/build/build_all.xml
===================================================================
--- branches/5.2.x/tools/build/build_all.xml
+++ branches/5.2.x/tools/build/build_all.xml
@@ -13,12 +13,14 @@
<parallel threadCount="4">
<phingcall target="phpmd-ci-inc">
<property name="param.report.file" value="pmd_modules.xml"/>
+ <property name="param.cache.file" value="pmd_modules_result_cache.php"/>
<property name="param.include" value="${scan.dir}/modules"/>
<property name="param.exclude" value="admin_templates,mpdf"/>
</phingcall>
<phingcall target="phpmd-ci-inc">
<property name="param.report.file" value="pmd_core.xml"/>
+ <property name="param.cache.file" value="pmd_core_result_cache.php"/>
<property name="param.include" value="${scan.dir}/core"/>
<property name="param.exclude" value="admin_templates,ckeditor,editor,units/general/libchart"/>
</phingcall>
Index: branches/5.2.x/tools/build/build_custom.xml
===================================================================
--- branches/5.2.x/tools/build/build_custom.xml
+++ branches/5.2.x/tools/build/build_custom.xml
@@ -15,6 +15,7 @@
<parallel threadCount="4">
<phingcall target="phpmd-ci-inc">
<property name="param.report.file" value="pmd_custom.xml"/>
+ <property name="param.cache.file" value="pmd_custom_result_cache.php"/>
<property name="param.include" value="${scan.dir}"/>
<property name="param.exclude" value="admin_templates"/>
</phingcall>
Index: branches/5.2.x/tools/build/targets/common.xml
===================================================================
--- branches/5.2.x/tools/build/targets/common.xml
+++ branches/5.2.x/tools/build/targets/common.xml
@@ -6,7 +6,7 @@
installed as follows:
Install packages:
- composer global require sebastian/phpcpd:~2.0 phploc/phploc:~2.1 phpmd/phpmd:~2.2 phing/phing:~2.1 squizlabs/php_codesniffer:~2.3
+ composer global require sebastian/phpcpd:~2.0 phploc/phploc:~2.1 phpmd/phpmd:^2.14 phing/phing:~2.1 squizlabs/php_codesniffer:^3.0
Add following to the your ".bashrc" file:
export PATH="$PATH:$HOME/.composer/vendor/bin"
@@ -106,7 +106,7 @@
</target>
<target name="phpmd-ci-inc">
- <exec executable="phpmd" passthru="true">
+ <exec executable="phpmd" passthru="true" dir="${base.dir}">
<arg path="${param.include}"/>
<arg value="xml"/>
<arg value="${build.config.dir}/inc/phpmd.xml"/>
@@ -116,6 +116,9 @@
<arg value="php"/>
<arg value="--exclude"/>
<arg value="${param.exclude}"/>
+ <arg value="--cache"/>
+ <arg value="--cache-file"/>
+ <arg value="${build.cache.dir}/${param.cache.file}"/>
</exec>
</target>
@@ -123,6 +126,7 @@
<exec executable="phpcs" passthru="true">
<arg value="--standard=${vendor.dir}/aik099/coding-standard/CodingStandard"/>
<arg value="-wps"/>
+ <arg value="--cache"/>
<arg value="--encoding=UTF-8"/>
<arg value="--extensions=php"/>
<arg value="-d"/>
@@ -149,6 +153,7 @@
<arg value="--report-file=${build.logs.dir}/checkstyle.xml"/>
<arg value="--standard=${vendor.dir}/aik099/coding-standard/CodingStandard"/>
<arg value="-wp"/>
+ <arg value="--cache"/>
<arg value="--encoding=UTF-8"/>
<arg value="--extensions=php"/>
<arg value="-d"/>
@@ -199,7 +204,7 @@
<property name="pdo.dsn.without.db" value="mysql:host=${db.host}"/>
<property name="pdo.dsn" value="${pdo.dsn.without.db};dbname=${db.name}"/>
- <property name="build.config.dir" value="."/>
+ <property name="build.config.dir" value="${base.dir}/tools/build"/>
<property name="build.dir" value="${base.dir}/build"/>
<!--<property name="build.api.dir" value="${build.dir}/api"/>-->
<!--<property name="build.coverage.dir" value="${build.dir}/coverage"/>-->

Event Timeline