From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 15 Mar 2011 14:03:56 +0000 (+0000)
Subject: Generate publis correctely.
X-Git-Tag: v3.6_beta2~164
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b4e1ff1d7acc7cbbd793877dbd2603801d705c6c

Generate publis correctely.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9796 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 308831cfb8..bda480e43d 100644
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -46,8 +46,6 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV
 	ADD_CUSTOM_TARGET(simgrid_documentation
 		COMMENT "Generating the SimGrid documentation..."
 		DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen}
-		COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/html
-		COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/html
 		COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${CMAKE_HOME_DIRECTORY}/doc/fig/simgrid_modules.fig | perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g' | ${CMAKE_HOME_DIRECTORY}/tools/doxygen/fig2dev_postprocessor.pl > ${CMAKE_HOME_DIRECTORY}/doc/simgrid_modules.map
 		WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
 	)
@@ -111,33 +109,27 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV
 		WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/
 	)
 
-	
-	ADD_CUSTOM_COMMAND(
-		OUTPUT ${CMAKE_HOME_DIRECTORY}/doc/publis_count.html
-		DEPENDS all.bib
-		COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_table_count.pl < ${CMAKE_HOME_DIRECTORY}/doc/all.bib > ${CMAKE_HOME_DIRECTORY}/doc/publis_count.html
-	)
-	add_dependencies(simgrid_documentation ${CMAKE_HOME_DIRECTORY}/doc/publis_count.html)
-
-	ADD_CUSTOM_COMMAND(
-		OUTPUT publis_core.bib publis_extern.bib publis_intra.bib
-		DEPENDS all.bib
-
-		COMMAND ${BIBTOOL_PATH}/bibtool -- 'select.by.string={category "core"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' ${CMAKE_HOME_DIRECTORY}/doc/all.bib -o ${CMAKE_HOME_DIRECTORY}/doc/publis_core.bib
-		COMMAND ${BIBTOOL_PATH}/bibtool -- 'select.by.string={category "extern"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' ${CMAKE_HOME_DIRECTORY}/doc/all.bib -o ${CMAKE_HOME_DIRECTORY}/doc/publis_extern.bib
-		COMMAND ${BIBTOOL_PATH}/bibtool -- 'select.by.string={category "intra"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' ${CMAKE_HOME_DIRECTORY}/doc/all.bib -o ${CMAKE_HOME_DIRECTORY}/doc/publis_intra.bib
-	)
+	ADD_CUSTOM_TARGET(bib_files
+		DEPENDS ${CMAKE_HOME_DIRECTORY}/doc/all.bib
+		COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/html
+		COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/html
+		COMMAND ${CMAKE_COMMAND} -E echo "XX Generate publis_core.bib publis_extern.bib publis_intra.bib"
+		COMMAND ${BIBTOOL_PATH}/bibtool -- 'select.by.string={category \"core\"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' all.bib -o publis_core.bib
+		COMMAND ${BIBTOOL_PATH}/bibtool -- 'select.by.string={category \"extern\"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' all.bib -o publis_extern.bib
+		COMMAND ${BIBTOOL_PATH}/bibtool -- 'select.by.string={category \"intra\"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' all.bib -o publis_intra.bib
 
-	foreach(file "publis_core publis_extern publis_intra")
-		ADD_CUSTOM_COMMAND(
-			OUTPUT ${CMAKE_HOME_DIRECTORY}/doc/${file}.html
-			DEPENDS "${file}.bib"
+		COMMAND ${CMAKE_COMMAND} -E echo "XX Generate publis_count.html"
+		COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_table_count.pl < ${CMAKE_HOME_DIRECTORY}/doc/all.bib > ${CMAKE_HOME_DIRECTORY}/doc/publis_count.html
 		
-			COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_wrapper.pl ${file}
-		)
+		COMMAND ${CMAKE_COMMAND} -E echo "XX Generate publis_core.html publis_extern.html publis_intra.html"
+		COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_wrapper.pl publis_core
+		COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_wrapper.pl publis_extern
+		COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_wrapper.pl publis_intra
+		
+		WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/
+	)
 
-		add_dependencies(simgrid_documentation ${CMAKE_HOME_DIRECTORY}/doc/${file}.html)
-	endforeach(file "publis_core publis_extern publis_intra")
+	add_dependencies(simgrid_documentation bib_files)
 	
 else(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH AND GOOD_BIBTEX2HTML_VERSION)
 
diff --git a/doc/FAQ.doc b/doc/FAQ.doc
index d74e8824bc..129f926c3d 100644
--- a/doc/FAQ.doc
+++ b/doc/FAQ.doc
@@ -1471,7 +1471,7 @@ and build/install it from scratch
 
  - <b>Enable GTNetS support in SimGrid</b>
  
-In order to enable gtnets with simgrid you have to give where is gtnets. (path to <gtnets_path>/lib and <gtnets_path>/include)
+In order to enable gtnets with simgrid you have to give where is gtnets. (path to \<gtnets_path\>/lib and \<gtnets_path\>/include)
 
    \verbatim
    Since v3.4 (with cmake)
diff --git a/tools/doxygen/bibtex2html_wrapper.pl b/tools/doxygen/bibtex2html_wrapper.pl
index bf24f697a7..5e412846a1 100755
--- a/tools/doxygen/bibtex2html_wrapper.pl
+++ b/tools/doxygen/bibtex2html_wrapper.pl
@@ -5,6 +5,9 @@ use strict;
 my $file = shift @ARGV || die "USAGE: bibtex2html_wrapper <file>\n";
 
 my $output;
+my $write;
+my $line;
+my $title;
 
 open IN,"bibtex2html -single-output -nv -force -sort year -copy-icons ${file}.bib -output -|iconv -f latin1 -t utf8 -|";
 
@@ -26,6 +29,7 @@ while($line = <IN>) {
 	    next;
 	}
 	if($line =~ /height="35"/) {
+		my $output;
 	    ## Change this uggly table into a h2
 	    do {
 		$line = <IN>;
@@ -56,3 +60,7 @@ while($line = <IN>) {
     }
     
 }
+open(OUT,">${file}_bib.html");
+print OUT $output;
+close(OUT);
+close(IN);
\ No newline at end of file