Keep only one doxygen file. We keep the file build by Regis as it works both...

Keep only one doxygen file. We keep the file build by Regis as it works both with Eclipse and with perl script, however we rename it to have a config file name that match the script name.

doc/dev/dolibarr-doxygen-build.pl

@@ -13,22 +13,21 @@ $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 $OPTIONS="";
 #$OPTIONS="-d Preprocessor";
 
-$CONFFILE="doc/dev/dolibarr-doxygen.conf";
-#$CONFFILE="doc/dev/dolibarr-doxygen2.conf";
+$CONFFILE="dolibarr-doxygen.doxyfile";
 
 use Cwd;
 my $dir = getcwd;
     
 print "Current dir is: $dir\n";
-print "Running dir for doxygen must be: $DIR/../..\n";
+print "Running dir for doxygen must be: $DIR\n";
 
-if (! -s "doc/dev/dolibarr-doxygen.conf")
+if (! -s $CONFFILE)
 {
     print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
     print "\n";
-	print "Change your current directory then to launch the script, run:\n";
-	print '> perl doc\dev\dolibarr-doxygen-build.pl  (on Windows)'."\n";
-	print '> perl doc/dev/dolibarr-doxygen-build.pl  (on Linux or BSD)'."\n";
+	print "Change your current directory then, to launch the script, run:\n";
+	print '> perl dolibarr-doxygen-build.pl  (on Windows)'."\n";
+	print '> perl dolibarr-doxygen-build.pl  (on Linux or BSD)'."\n";
     sleep 4;
     exit 1;   
 }

doc/dev/dolibarr-doxygen.conf → doc/dev/dolibarr-doxygen.doxyfile

-# Doxyfile 1.5.5
+# Doxyfile 1.6.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -38,7 +38,7 @@ PROJECT_NUMBER         = 2.7.0
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc/dev
+OUTPUT_DIRECTORY = ../../doc/dev
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -155,13 +155,6 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # re-implements.
@@ -518,7 +511,7 @@ WARN_LOGFILE           = doxygen_warnings.log
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = htdocs
+INPUT = ../../htdocs
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -536,8 +529,7 @@ INPUT_ENCODING         = ISO-8859-1
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
-FILE_PATTERNS          = *.php \
-                         *.pl
+FILE_PATTERNS = *.php *.pl
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 
@@ -549,48 +541,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = mssql \
-                         mysql \
-                         pgsql \
-                         CVS \
-                         build \
-                         dev \
-                         doc \
-                         documents \
-                         htdocs/conf/conf.php \
-                         htdocs/includes/adodbtime \
-                         htdocs/includes/artichow \
-                         htdocs/includes/barcode \
-                         htdocs/includes/fckeditor \
-                         htdocs/includes/fpdf \
-                         htdocs/includes/geoip \
-                         htdocs/includes/magpierss \
-                         htdocs/includes/nusoap \
-                         htdocs/includes/pear \
-                         htdocs/includes/php_excelreader \
-                         htdocs/includes/php_writeexcel \
-                         htdocs/includes/phplot \
-                         htdocs/includes/phplot5 \
-                         htdocs/includes/pwc \
-                         htdocs/includes/scriptaculous \
-                         htdocs/includes/simplemail \
-                         htdocs/includes/smarty \
-                         htdocs/includes/smtps \
-                         htdocs/includes/vcard \
-                         htdocs/avoir \
-                         htdocs/document \
-                         htdocs/documents \
-                         htdocs/lolix \
-                         htdocs/postnuke \
-                         htdocs/rapport \
-                         htdocs/telephonie \
-                         htdocs/voyage \
-                         htdocs/oscommerce_ws/ws_client_demo \
-                         htdocs/oscommerce_ws/ws_server \
-                         scripts/addons \
-                         scripts/courrier \
-                         scripts/lolix \
-                         scripts/energie
+EXCLUDE = mssql mysql pgsql CVS build dev doc documents htdocs/conf/conf.php htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/fckeditor htdocs/includes/fpdf htdocs/includes/geoip htdocs/includes/magpierss htdocs/includes/nusoap htdocs/includes/pear htdocs/includes/php_excelreader htdocs/includes/php_writeexcel htdocs/includes/phplot htdocs/includes/phplot5 htdocs/includes/pwc htdocs/includes/scriptaculous htdocs/includes/simplemail htdocs/includes/smarty htdocs/includes/smtps htdocs/includes/vcard htdocs/avoir htdocs/document htdocs/documents htdocs/lolix htdocs/postnuke htdocs/rapport htdocs/telephonie htdocs/voyage htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
@@ -604,9 +555,7 @@ EXCLUDE_SYMLINKS       = YES
 # against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */CVS/* \
-                         *google* \
-                         *pibarcode*
+EXCLUDE_PATTERNS = */CVS/* *google* *pibarcode*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
 # (namespaces, classes, functions, etc.) that should be excluded from the 
@@ -1261,7 +1210,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default)
 
-HAVE_DOT               = YES
+HAVE_DOT = NO
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and