From c3dd8348fe77db7558106c2849cfe6a6284ccaa2 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 28 Sep 2012 20:54:47 +0200
Subject: [PATCH] Fix: PEAR packages upgrade in Jenkins server has caused
problems with CodeSniffer. The exclusion directory was no longer taken. I
restored the server backup.
---
build.xml | 6 +++---
quickbuild.xml | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/build.xml b/build.xml
index 16e418218e8..be47aadb527 100644
--- a/build.xml
+++ b/build.xml
@@ -21,7 +21,7 @@
<parallel>
<!-- <antcall target="phpmd"/> -->
<antcall target="phpcpd"/>
- <antcall target="phpcs"/>
+ <!-- <antcall target="phpcs"/> -->
<antcall target="doxygen"/>
<antcall target="phploc"/>
</parallel>
@@ -72,8 +72,8 @@
<exec executable="phpcs" dir="${basedir}">
<arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
--report=checkstyle
+ --report-file=${basedir}/hudson/logs/checkstyle.xml
--ignore=${ignorepaths},${ignoreregexp}
- --report-file=${basedir}/hudson/logs/checkstyle.xml
htdocs
"/>
</exec>
@@ -98,5 +98,5 @@
</exec>
</target>
- <target name="hudson" depends="clean,phpunit,parallelTasks"/>
+ <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
</project>
\ No newline at end of file
diff --git a/quickbuild.xml b/quickbuild.xml
index 01fb110ee7f..2ce72f32b5d 100644
--- a/quickbuild.xml
+++ b/quickbuild.xml
@@ -2,7 +2,7 @@
<project name="dolibarr" default="hudson" basedir=".">
<!-- Exclude/ignore paths -->
- <property name="ignorepaths" value="${basedir}/htdocs/conf/*,${basedir}/htdocs/core/filemanagerdol/*,${basedir}/htdocs/includes/*" />
+ <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
<property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
<target name="clean">
@@ -69,10 +69,9 @@
<target name="phpcs">
<exec executable="phpcs" dir="${basedir}">
<arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
- --ignore=${ignorepaths},${ignoreregexp}
--report=checkstyle
--report-file=${basedir}/hudson/logs/checkstyle.xml
- -v
+ --ignore=${ignorepaths},${ignoreregexp}
htdocs
"/>
</exec>
--
GitLab