From 1a4be7b31e89d998fb782f1a6fe5643f46bdf046 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 27 Jan 2008 13:59:13 +0000
Subject: [PATCH] Ajout filtre sur gene doc doxygen pour gerer automatiquement
 les versions

---
 doc/dev/dolibarr-doxygen-build.pl      | 10 +++++++---
 doc/dev/dolibarr-doxygen-filter.pl     |  5 +++--
 doc/dev/dolibarr-doxygen-getversion.pl |  3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/dev/dolibarr-doxygen-build.pl b/doc/dev/dolibarr-doxygen-build.pl
index 12e3b80eb70..1111abca3d1 100755
--- a/doc/dev/dolibarr-doxygen-build.pl
+++ b/doc/dev/dolibarr-doxygen-build.pl
@@ -2,8 +2,7 @@
 #--------------------------------------------------------------------
 # Lance la generation de la doc dev doxygen
 #
-# $Id$
-# $Source$
+# \version	$Id$
 #--------------------------------------------------------------------
 
 # Detecte repertoire du script
@@ -11,6 +10,11 @@
 $DIR||='.';
 $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 
+$OPTIONS="";
+$OPTIONS="-d Preprocessor";
+
+$CONFFILE="doc/dev/dolibarr-doxygen.conf";
+$CONFFILE="doc/dev/dolibarr-doxygen2.conf";
 
 use Cwd;
 my $dir = getcwd;
@@ -25,7 +29,7 @@ if (! -s "doc/dev/dolibarr-doxygen.conf") {
 }
 
 print "Running doxygen, please wait...\n";
-$result=`doxygen doc/dev/dolibarr-doxygen.conf 2>&1`;
+$result=`doxygen $OPTIONS $CONFFILE 2>&1`;
 
 print $result;
 
diff --git a/doc/dev/dolibarr-doxygen-filter.pl b/doc/dev/dolibarr-doxygen-filter.pl
index 0ed33321166..d1f1bb1847b 100755
--- a/doc/dev/dolibarr-doxygen-filter.pl
+++ b/doc/dev/dolibarr-doxygen-filter.pl
@@ -2,9 +2,10 @@
 #--------------------------------------------------------------------
 # Script filtrage des sources Dolibarr pour doxygen
 #
-# $Id$
+# \version $Id$
 #--------------------------------------------------------------------
 
+# Usage: dolibarr-doxygen-getversion.pl pathtofilefromdolibarrroot
 
 $file=$ARGV[0];
 
@@ -14,7 +15,7 @@ while (<FILE>)
 	if ($_ =~ /\\version\s/i)
 	{
 		$_ =~ s/\$Id://i;
-		$_ =~ s/Exp \$//i;
+		$_ =~ s/(Exp|)\s\$$//i;
 		$_ =~ s/(\\version\s+)[^\s]+\s/$1/i;
 		$_ =~ s/(\w)\s(\w)/$1_$2/g;
 	}
diff --git a/doc/dev/dolibarr-doxygen-getversion.pl b/doc/dev/dolibarr-doxygen-getversion.pl
index 216f7280ca7..4c3f68d329c 100755
--- a/doc/dev/dolibarr-doxygen-getversion.pl
+++ b/doc/dev/dolibarr-doxygen-getversion.pl
@@ -2,9 +2,10 @@
 #--------------------------------------------------------------------
 # Script recup version d'un source
 #
-# $Id$
+# \version $Id$
 #--------------------------------------------------------------------
 
+# Usage: dolibarr-doxygen-getversion.pl pathtofilefromdolibarrroot
 
 $file=$ARGV[0];