Pārlūkot izejas kodu

Fix: PEAR packages upgrade in Jenkins server has caused problems with
CodeSniffer. The exclusion directory was no longer taken. I restored the
server backup.

Regis Houssin 12 gadi atpakaļ
vecāks
revīzija
c3dd8348fe
2 mainītis faili ar 5 papildinājumiem un 6 dzēšanām
  1. 3 3
      build.xml
  2. 2 3
      quickbuild.xml

+ 3 - 3
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>

+ 2 - 3
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>