Fix: update hudson files for build 3.1-stable

build.xml

@@ -1,30 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="dolibarr" default="hudson" basedir=".">
+
+<!-- Exclude/ignore paths -->
+ <property name="ignorepaths" value="${basedir}/htdocs/includes/adodbtime,${basedir}/htdocs/includes/artichow,${basedir}/htdocs/includes/barcode/php-barcode,${basedir}/htdocs/includes/ckeditor,${basedir}/htdocs/includes/efc_xfss,${basedir}/htdocs/includes/fckeditor,${basedir}/htdocs/includes/fpdf,${basedir}/htdocs/includes/geoip,${basedir}/htdocs/includes/jquery,${basedir}/htdocs/includes/jsgantt,${basedir}/htdocs/includes/magpierss,${basedir}/htdocs/includes/nusoap,${basedir}/htdocs/includes/odtphp,${basedir}/htdocs/includes/php_writeexcel,${basedir}/htdocs/includes/phpexcel,${basedir}/htdocs/includes/smarty,${basedir}/htdocs/includes/smtps,${basedir}/htdocs/includes/tcpdf,${basedir}/htdocs/includes/vcard" />
+
  <target name="clean">
   <!-- Clean up -->
   <delete dir="${basedir}/hudson"/>
+  <delete dir="${basedir}/generatedJUnitFiles"/>
 
   <!-- Create build directories -->
-  <mkdir dir="${basedir}/hudson/api"/>
   <mkdir dir="${basedir}/hudson/doxygen"/>
-  <mkdir dir="${basedir}/hudson/code-browser"/>
-  <mkdir dir="${basedir}/hudson/coverage"/>
   <mkdir dir="${basedir}/hudson/logs"/>
-  <mkdir dir="${basedir}/hudson/pdepend"/>
+  <mkdir dir="${basedir}/hudson/coverage"/>
  </target>
 
- <!-- Run unit tests and generate junit.xml and clover.xml -->
- <target name="phpunit">
-  <exec dir="${basedir}" executable="phpunit" failonerror="true">
-   <arg line="--configuration test/phpunit/hudson-phpunit.xml" />
-  </exec>
- </target>
-
- <!-- Run pdepend, phpmd, phpcpd, phpcs, phpdoc and phploc in parallel -->
+ <!-- Run phpmd, phpcpd, phpcs, doxygen and phploc in parallel -->
  <target name="parallelTasks">
   <parallel>
-   <antcall target="pdepend"/>
-   <antcall target="phpmd"/>
+   <!-- <antcall target="phpmd"/> -->
    <antcall target="phpcpd"/>
    <antcall target="phpcs"/>
    <antcall target="doxygen"/>
@@ -32,34 +26,41 @@
   </parallel>
  </target>
 
- <!-- Generate jdepend.xml and software metrics charts -->
- <target name="pdepend">
-  <exec executable="pdepend">
-   <arg line="--jdepend-xml='${basedir}/hudson/logs/jdepend.xml'
-              --jdepend-chart='${basedir}/hudson/pdepend/dependencies.svg'
-              --summary-xml='${basedir}/hudson/logs/jdepend-summary.xml'
-              --overview-pyramid='${basedir}/hudson/pdepend/overview-pyramid.svg'
-              --ignore='${basedir}/htdocs/includes'
-              htdocs
-              " />
-  </exec>
- </target>
-
  <!-- Generate pmd.xml -->
+<!--
 <target name="phpmd">
   <exec executable="phpmd">
    <arg line="htdocs xml codesize,unusedcode
-              --reportfile '${basedir}/hudson/logs/pmd.xml'
-              --exclude '${basedir}/htdocs/includes'
+              -\-reportfile '${basedir}/hudson/logs/pmd.xml'
+              -\-ignore=${ignorepaths}
               " />
   </exec>
  </target>
-  
+-->
+
  <!-- Generate pmd-cpd.xml -->
  <target name="phpcpd">
   <exec executable="phpcpd">
    <arg line="--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
-              --exclude '${basedir}/htdocs/includes'
+              --exclude '${basedir}/htdocs/includes/adodbtime'
+              --exclude '${basedir}/htdocs/includes/artichow'
+              --exclude '${basedir}/htdocs/includes/barcode/php-barcode'
+              --exclude '${basedir}/htdocs/includes/ckeditor'
+              --exclude '${basedir}/htdocs/includes/efc_xfss'
+              --exclude '${basedir}/htdocs/includes/fckeditor'
+              --exclude '${basedir}/htdocs/includes/fpdf'
+              --exclude '${basedir}/htdocs/includes/geoip'
+              --exclude '${basedir}/htdocs/includes/jquery'
+              --exclude '${basedir}/htdocs/includes/jsgantt'
+              --exclude '${basedir}/htdocs/includes/magpierss'
+              --exclude '${basedir}/htdocs/includes/nusoap'
+              --exclude '${basedir}/htdocs/includes/odtphp'
+              --exclude '${basedir}/htdocs/includes/php_writeexcel'
+              --exclude '${basedir}/htdocs/includes/phpexcel'
+              --exclude '${basedir}/htdocs/includes/smarty'
+              --exclude '${basedir}/htdocs/includes/smtps'
+              --exclude '${basedir}/htdocs/includes/tcpdf'
+              --exclude '${basedir}/htdocs/includes/vcard'
               htdocs
               " />
   </exec>
@@ -69,7 +70,25 @@
  <target name="phploc">
   <exec executable="phploc">
    <arg line="--log-csv '${basedir}/hudson/logs/phploc.csv'
-              --exclude '${basedir}/htdocs/includes'
+              --exclude '${basedir}/htdocs/includes/adodbtime'
+              --exclude '${basedir}/htdocs/includes/artichow'
+              --exclude '${basedir}/htdocs/includes/barcode/php-barcode'
+              --exclude '${basedir}/htdocs/includes/ckeditor'
+              --exclude '${basedir}/htdocs/includes/efc_xfss'
+              --exclude '${basedir}/htdocs/includes/fckeditor'
+              --exclude '${basedir}/htdocs/includes/fpdf'
+              --exclude '${basedir}/htdocs/includes/geoip'
+              --exclude '${basedir}/htdocs/includes/jquery'
+              --exclude '${basedir}/htdocs/includes/jsgantt'
+              --exclude '${basedir}/htdocs/includes/magpierss'
+              --exclude '${basedir}/htdocs/includes/nusoap'
+              --exclude '${basedir}/htdocs/includes/odtphp'
+              --exclude '${basedir}/htdocs/includes/php_writeexcel'
+              --exclude '${basedir}/htdocs/includes/phpexcel'
+              --exclude '${basedir}/htdocs/includes/smarty'
+              --exclude '${basedir}/htdocs/includes/smtps'
+              --exclude '${basedir}/htdocs/includes/tcpdf'
+              --exclude '${basedir}/htdocs/includes/vcard'
               htdocs
               " />
   </exec>
@@ -77,32 +96,32 @@
    
  <!-- Generate checkstyle.xml -->
  <target name="phpcs">
-  <exec executable="phpcs" output="/dev/null">
-   <arg line="--report=checkstyle
-              --report-file='${basedir}/hudson/logs/checkstyle.xml'
-              --standard=Sebastian
-              --ignore=*\\htdocs\\includes\\*
-              htdocs
-              " />
+  <exec executable="phpcs" dir="${basedir}" output="${basedir}/hudson/logs/checkstyle.xml">
+    <arg line=" --standard=${basedir}/test/codesniffer/ruleset.xml
+    			--report=checkstyle
+                --ignore=${ignorepaths}
+                htdocs
+                "/>
   </exec>
  </target>
 
- <!-- Generate API documentation -->
+ <!-- Generate Doxygen documentation -->
  <target name="doxygen" description="Dolibarr documentation" >
-  <exec executable="doxygen" dir="${basedir}/hudson/doxygen" failonerror="false">
-   <arg value="${basedir}/build/doxygen/dolibarr-doxygen.doxyfile"/>
+  <exec executable="doxygen" dir="${basedir}" failonerror="false">
+   <arg value="${basedir}/build/doxygen/hudson-doxygen.doxyfile"/>
   </exec>
  </target>
  
- <target name="phpcb">
-  <exec executable="phpcb">
-   <arg line="--log    '${basedir}/hudson/logs'
-              --source '${basedir}/htdocs'
-              --output '${basedir}/hudson/code-browser'
-              --ignore '${basedir}/htdocs/includes'
-              " />
+ <!-- Run unit tests and generate junit.xml and clover.xml -->
+ <target name="phpunit">
+  <exec executable="phpunit" dir="${basedir}" failonerror="true">
+   <arg line="	--log-junit ${basedir}/hudson/logs/junit.xml
+				--coverage-clover ${basedir}/hudson/coverage/clover.xml
+  				--coverage-html ${basedir}/hudson/coverage/
+  				test/phpunit/AllTests.php
+  				"/>
   </exec>
  </target>
-  
- <target name="hudson" depends="clean,parallelTasks,phpunit,phpcb"/>
+
+ <target name="hudson" depends="clean,parallelTasks,phpunit"/>
 </project>

test/phpunit/hudson-phpunit.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE phpunit SYSTEM "phpunit.dtd" >
-<phpunit bootstrap="AllTests.php"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    stopOnFailure="false"
-    backupGlobals="false"
-    syntaxCheck="true">
-
-    <testsuite name="dolibarr">
-        <directory suffix="Test.php">./</directory>
-    </testsuite>
-
-    <logging>
-        <log type="coverage-html" target="build/coverage/" title="Dolibarr"
-            charset="UTF-8" yui="true" highlight="true"
-            lowUpperBound="35" highLowerBound="70"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-    </logging>
-
-</phpunit>