From 764a13ddea18dd665ab4cbd988b0086402238dad Mon Sep 17 00:00:00 2001
From: gamonoid <contact@gamonoid.com>
Date: Thu, 7 Sep 2017 23:44:45 +0200
Subject: [PATCH] Update build settings

---
 build.xml  | 27 ++++-----------------------
 phpdox.xml | 12 ++++++------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/build.xml b/build.xml
index e3ce813d..0d0a7886 100644
--- a/build.xml
+++ b/build.xml
@@ -12,12 +12,12 @@
 
 
 <target name="build"
-     depends="prepare,lint,copyapp,phpunit,release,install"
+     depends="prepare,lint,copyapp,phpunit,phpdox,release,install"
      description=""/>
 
 <target name="buildlocal"
-     depends="prepare,copyapp"
-     description=""/>
+        depends="prepare,lint,copyapp,phpunit"
+        description=""/>
 
 <target name="releaseapp"
         depends="prepare,lint,copyapp,phpunit,release"
@@ -183,8 +183,7 @@
          depends=""
          description="Generate project documentation using phpDox">
   <exec executable="${toolsdir}phpdox"/>
- </target>
-
+</target>
 
 <target name="copyapp"
         description="Copy generated files to QA app">
@@ -210,24 +209,6 @@
         </fileset>
     </delete>
 
-    <!--<copy todir="${destination}/lib" overwrite="true">-->
-        <!--<fileset dir="${basedir}/lib">-->
-            <!--<include name="**/*"/>-->
-        <!--</fileset>-->
-    <!--</copy>-->
-
-    <!--<copy todir="${destination}" overwrite="true">-->
-        <!--<fileset dir="${basedir}/core-ext">-->
-            <!--<include name="**/*"/>-->
-        <!--</fileset>-->
-    <!--</copy>-->
-
-    <!--<copy todir="${destination}" overwrite="true">-->
-        <!--<fileset dir="${basedir}/ext">-->
-            <!--<include name="**/*"/>-->
-        <!--</fileset>-->
-    <!--</copy>-->
-
     <copy todir="${testdir}" overwrite="true">
         <fileset dir="${basedir}/test">
             <include name="**/*"/>
diff --git a/phpdox.xml b/phpdox.xml
index 70014028..16726928 100644
--- a/phpdox.xml
+++ b/phpdox.xml
@@ -1,10 +1,10 @@
-<phpdox xmlns="http://phpdox.net/config">
- <project name="icehrm" source="./build/app" workdir="./build/phpdox">
+<phpdox xmlns="http://xml.phpdox.net/config">
+ <project name="icehrm" source="." workdir="./build/phpdox">
   <collector publiconly="false">
    <include mask="*.php" />
-   <exclude mask="**/lib/**"/>
-   <exclude mask="**/adodb512/**"/>
-   <exclude mask="**/composer/**"/>
+   <exclude mask="*/lib/**"/>
+   <exclude mask="*/adodb512/**"/>
+   <exclude mask="*/composer/**"/>
   </collector>
 
   <generator output="build">
@@ -13,4 +13,4 @@
    </build>
   </generator>
  </project>
-</phpdox>
\ No newline at end of file
+</phpdox>