X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/651a8ba37d86440d8194da06e1e920c6de399e51..8003745e664b99b82b9e93e470728c193df8cd34:/buildtools/Cmake/GenerateDoc.cmake

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 83e683bdcc..e478ee18d5 100644
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -1,3 +1,5 @@
+#### Generate the html documentation
+
 if(BIBTEX2HTML)
 	set(BIBTEX2HTML_PATH ${BIBTEX2HTML})
 else(BIBTEX2HTML)
@@ -45,7 +47,7 @@ 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}
+		DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen} ${DOC_bib}
 		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
 	)
@@ -164,9 +166,27 @@ endif(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND IC
 ##############################################################################"
 
 message(STATUS "Check individual TOCs")
-file(GLOB_RECURSE LISTE_GTUT
-	"${CMAKE_HOME_DIRECTORY}/doc/gtut-tour-*.doc"
+set(LISTE_GTUT
+	doc/gtut-tour-00-install.doc
+	doc/gtut-tour-01-bones.doc
+	doc/gtut-tour-02-simple.doc
+	doc/gtut-tour-03-args.doc
+	doc/gtut-tour-04-callback.doc
+	doc/gtut-tour-05-globals.doc
+	doc/gtut-tour-06-logs.doc
+	doc/gtut-tour-07-timers.doc
+	doc/gtut-tour-08-exceptions.doc
+	doc/gtut-tour-09-simpledata.doc
+	doc/gtut-tour-10-rpc.doc
+	doc/gtut-tour-11-explicitwait.doc
+	doc/gtut-tour-recap-messages.doc
+	doc/gtut-tour-12-staticstruct.doc
+	doc/gtut-tour-13-pointers.doc
+	doc/gtut-tour-14-dynar.doc
+	doc/gtut-tour-15-manualdatadef.doc
+	doc/gtut-tour-16-exchangecb.doc
 )
+
 foreach(file_name ${LISTE_GTUT})
 	file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc)
 	file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc)
@@ -175,7 +195,8 @@ foreach(file_name ${LISTE_GTUT})
 	string(REGEX MATCH "Table of Contents.*<hr>" valeur_line "${file_content}")
 	string(REPLACE "\n" ";" valeur_line "${valeur_line}")
 	string(REPLACE "\n" ";" file_content "${file_content}")
-	
+	       
+	file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc "\n") # make sure it exists
 	foreach(line ${file_content})
 		string(REGEX MATCH "[\\]s?u?b?s?u?b?section.*" line2 "${line}")
 		string(REGEX MATCH ".*_toc.*" line3 "${line}")
@@ -191,6 +212,7 @@ foreach(file_name ${LISTE_GTUT})
 		endif(line2 AND NOT line3)
 	endforeach(line ${file_content})
 	
+	file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc "\n") # make sure it exists
 	foreach(line ${valeur_line})
 		string(REGEX MATCH ".*ref.*" line_ok ${line})
 		if(line_ok)