Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into gforge
[simgrid.git] / buildtools / Cmake / GenerateDoc.cmake
index fd0dbcf..2809083 100644 (file)
@@ -1,9 +1,7 @@
-message("\tBIBTEX2HTML  : ${BIBTEX2HTML}")
-
 if(BIBTEX2HTML)
-set(BIBTEX2HTML_PATH ${BIBTEX2HTML})
+       set(BIBTEX2HTML_PATH ${BIBTEX2HTML})
 else(BIBTEX2HTML)
-find_path(BIBTEX2HTML_PATH     NAMES bibtex2html       PATHS NO_DEFAULT_PATHS)
+       find_path(BIBTEX2HTML_PATH      NAMES bibtex2html       PATHS NO_DEFAULT_PATHS)
 endif(BIBTEX2HTML)
 
 find_path(FIG2DEV_PATH NAMES fig2dev   PATHS NO_DEFAULT_PATHS)
@@ -11,167 +9,167 @@ find_path(DOXYGEN_PATH     NAMES doxygen   PATHS NO_DEFAULT_PATHS)
 find_path(BIBTOOL_PATH NAMES bibtool   PATHS NO_DEFAULT_PATHS)
 find_path(ICONV_PATH   NAMES iconv     PATHS NO_DEFAULT_PATHS)
 
-message("\tFIG2DEV_PATH : ${FIG2DEV_PATH}")
-message("\tDOXYGEN_PATH : ${DOXYGEN_PATH}")
-message("\tBIBTOOL_PATH : ${BIBTOOL_PATH}")
-message("\tICONV_PATH   : ${ICONV_PATH}")
-message("\tBIBTEX2HTML_PATH   : ${BIBTEX2HTML_PATH}")
-
 ### Check whether the bibtex2html that we found is the one that Arnaud requires
 exec_program("${BIBTEX2HTML_PATH}/bibtex2html -version" OUTPUT_VARIABLE OUTPUT_BIBTEX2HTML_VERSION)
 STRING(REPLACE "[-bibtex]" "" OUTPUT_BIBTEX2HTML_VERSION_2 ${OUTPUT_BIBTEX2HTML_VERSION})
 
-if(BIBTEX2HTML_PATH)
-       if(${OUTPUT_BIBTEX2HTML_VERSION_2} STREQUAL ${OUTPUT_BIBTEX2HTML_VERSION}) # wrong version
-               message("\nERROR --> NEED to set bibtex2html path with \"ccmake ./\" or with \"cmake -DBIBTEX2HTML=<path_to> ./\"")
-               message("\nTake care having install the good bibtex2html \n\t(download it : ftp://ftp-sop.inria.fr/epidaure/Softs/bibtex2html/bibtex2html-1.02.tar.gz)")
-               message(FATAL_ERROR "\n")
-       endif(${OUTPUT_BIBTEX2HTML_VERSION_2} STREQUAL ${OUTPUT_BIBTEX2HTML_VERSION})
-endif(BIBTEX2HTML_PATH)
-
-
 file(GLOB_RECURSE source_doxygen
-       "${PROJECT_DIRECTORY}/tools/gras/*.[chl]"
-       "${PROJECT_DIRECTORY}/src/*.[chl]"
-       "${PROJECT_DIRECTORY}/include/*.[chl]"
-)
-
-ADD_CUSTOM_TARGET(APPEND_DOC
-       COMMENT "Generating the SimGrid documentation..."
-       DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen}
-       COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/doc/html
-       COMMAND ${CMAKE_COMMAND} -E make_directory   ${PROJECT_DIRECTORY}/doc/html
-       COMMAND ${CMAKE_COMMAND} -E make_directory   ${PROJECT_DIRECTORY}/doc/html/generated
-       COMMAND ${CMAKE_COMMAND} -E touch   ${PROJECT_DIRECTORY}/doc/html/generated
-       WORKING_DIRECTORY ${PROJECT_DIRECTORY}/doc
+       "${CMAKE_HOME_DIRECTORY}/tools/gras/*.[chl]"
+       "${CMAKE_HOME_DIRECTORY}/src/*.[chl]"
+       "${CMAKE_HOME_DIRECTORY}/include/*.[chl]"
 )
 
-string(REGEX REPLACE ";.*logcategories.doc" "" LISTE_DEUX "${LISTE_DEUX}")
+if(${OUTPUT_BIBTEX2HTML_VERSION_2} STREQUAL ${OUTPUT_BIBTEX2HTML_VERSION}) # wrong version
+       SET(GOOD_BIBTEX2HTML_VERSION 0)
+else(${OUTPUT_BIBTEX2HTML_VERSION_2} STREQUAL ${OUTPUT_BIBTEX2HTML_VERSION}) # good version
+       SET(GOOD_BIBTEX2HTML_VERSION 1)
+endif(${OUTPUT_BIBTEX2HTML_VERSION_2} STREQUAL ${OUTPUT_BIBTEX2HTML_VERSION})
 
-#DOC_SOURCE=doc/*.doc, defined in DefinePackage
-set(DOCSSOURCES "${source_doxygen}\n${DOC_SOURCE}")
-string(REPLACE "\n" ";" DOCSSOURCES ${DOCSSOURCES})
+if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH AND GOOD_BIBTEX2HTML_VERSION)
 
+       string(REGEX REPLACE ";.*logcategories.doc" "" LISTE_DEUX "${LISTE_DEUX}")
 
-set(DOC_PNGS 
-       ${PROJECT_DIRECTORY}/doc/webcruft/simgrid_logo.png
-       ${PROJECT_DIRECTORY}/doc/webcruft/simgrid_logo_small.png
-       ${PROJECT_DIRECTORY}/doc/webcruft/poster_thumbnail.png
-)
+       #DOC_SOURCE=doc/*.doc, defined in DefinePackage
+       set(DOCSSOURCES "${source_doxygen}\n${DOC_SOURCE}")
+       string(REPLACE "\n" ";" DOCSSOURCES ${DOCSSOURCES})
 
-if(DOXYGEN_PATH AND FIG2DEV_PATH)
 
-       ADD_CUSTOM_COMMAND(TARGET APPEND_DOC
-               COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules.fig |perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g' > ${PROJECT_DIRECTORY}/doc/simgrid_modules.map
+       set(DOC_PNGS 
+               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo.png
+               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_small.png
+               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
        )
        
-       foreach(file ${FIGS})
-               string(REPLACE ".fig" ".png" tmp_file ${file})
-               string(REPLACE "${PROJECT_DIRECTORY}/doc/fig/" "${PROJECT_DIRECTORY}/doc/html/" tmp_file ${tmp_file})
-               ADD_CUSTOM_COMMAND(TARGET APPEND_DOC
-                       COMMAND "${FIG2DEV_PATH}/fig2dev -Lpng ${file} ${tmp_file}"
-               )
-       endforeach(file ${FIGS})
-
+       configure_file(${CMAKE_HOME_DIRECTORY}/doc/Doxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/Doxyfile @ONLY)
+       configure_file(${CMAKE_HOME_DIRECTORY}/doc/footer.html.in ${CMAKE_HOME_DIRECTORY}/doc/footer.html @ONLY)                
+       
+       ADD_CUSTOM_TARGET(simgrid_documentation
+               COMMENT "Generating the SimGrid documentation..."
+               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
+       )
 
-       ADD_CUSTOM_COMMAND(TARGET APPEND_DOC
-               COMMAND ${CMAKE_COMMAND} -E touch ${PROJECT_DIRECTORY}/doc/index-API.doc ${PROJECT_DIRECTORY}/doc/.FAQ.doc.toc ${PROJECT_DIRECTORY}/doc/.index.doc.toc ${PROJECT_DIRECTORY}/doc/.contrib.doc.toc ${PROJECT_DIRECTORY}/doc/.history.doc.toc
+       ADD_CUSTOM_COMMAND(
+               OUTPUT ${CMAKE_HOME_DIRECTORY}/doc/logcategories.doc
+               DEPENDS ${source_doxygen}
+               COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/logcategories.doc
+               COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl > ${CMAKE_HOME_DIRECTORY}/doc/logcategories.doc
+               WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
        )
-       
 
+       foreach(file ${DOC_FIGS})
+               string(REPLACE ".fig" ".png" tmp_file ${file})
+               string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/fig/" "${CMAKE_HOME_DIRECTORY}/doc/html/" tmp_file ${tmp_file})
+               ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
+                       COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng ${file} ${tmp_file}
+               )
+       endforeach(file ${DOC_FIGS})
+       
        foreach(file ${DOC_PNGS})
-               ADD_CUSTOM_COMMAND(TARGET APPEND_DOC
-                       COMMAND ${CMAKE_COMMAND} -E copy ${file} ${PROJECT_DIRECTORY}/doc/html/
+               ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
+                       COMMAND ${CMAKE_COMMAND} -E copy ${file} ${CMAKE_HOME_DIRECTORY}/doc/html/
                )
        endforeach(file ${DOC_PNGS})
 
-       ADD_CUSTOM_COMMAND(TARGET APPEND_DOC
-               COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg ${PROJECT_DIRECTORY}/doc/html/
-               COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg     ${PROJECT_DIRECTORY}/doc/html/
-               COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/doc/triva-graph_configuration.png        ${PROJECT_DIRECTORY}/doc/html/
-               COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/doc/triva-graph_visualization.png        ${PROJECT_DIRECTORY}/doc/html/
-               COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/doc/simgrid.css                          ${PROJECT_DIRECTORY}/doc/html/
+       ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
+               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg ${CMAKE_HOME_DIRECTORY}/doc/html/
+               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg     ${CMAKE_HOME_DIRECTORY}/doc/html/
+               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/triva-graph_configuration.png        ${CMAKE_HOME_DIRECTORY}/doc/html/
+               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/triva-graph_visualization.png        ${CMAKE_HOME_DIRECTORY}/doc/html/
+               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css                          ${CMAKE_HOME_DIRECTORY}/doc/html/
        )
-
-       configure_file(${PROJECT_DIRECTORY}/doc/Doxyfile.in ${PROJECT_DIRECTORY}/doc/Doxyfile @ONLY)
-
-       ADD_CUSTOM_COMMAND(TARGET APPEND_DOC
-               WORKING_DIRECTORY ${PROJECT_DIRECTORY}/doc/
-               COMMAND ${CMAKE_COMMAND} -E echo "XX First Doxygen pass"
-               COMMAND ${DOXYGEN_PATH}/doxygen ${PROJECT_DIRECTORY}/doc/Doxyfile
-               COMMAND ${PROJECT_DIRECTORY}/tools/doxygen/index_create.pl simgrid.tag index-API.doc
-               COMMAND ${PROJECT_DIRECTORY}/tools/doxygen/toc_create.pl FAQ.doc index.doc contrib.doc gtut-introduction.doc history.doc
+       
+       ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
+           COMMAND ${CMAKE_COMMAND} -E echo "XX First Doxygen pass"
+               COMMAND ${DOXYGEN_PATH}/doxygen Doxyfile
+               COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/index_create.pl simgrid.tag index-API.doc
+               COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/toc_create.pl FAQ.doc index.doc contrib.doc gtut-introduction.doc history.doc
                
-               COMMAND ${CMAKE_COMMAND} -E echo XX Second Doxygen pass
-               COMMAND ${DOXYGEN_PATH}/doxygen ${PROJECT_DIRECTORY}/doc/Doxyfile
+               COMMAND ${CMAKE_COMMAND} -E echo "XX Second Doxygen pass"
+               COMMAND ${DOXYGEN_PATH}/doxygen Doxyfile
                
-               COMMAND ${CMAKE_COMMAND} -E echo XX Post-processing Doxygen result
-               COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/doc/html/dir*
-               COMMAND ${PROJECT_DIRECTORY}/tools/doxygen/index_php.pl index.php.in html/index.html index.php
-               COMMAND ${PROJECT_DIRECTORY}/tools/doxygen/doxygen_postprocesser.pl
-
-               COMMAND ${CMAKE_COMMAND} -E echo XX Create shortcuts pages 
-               COMMAND ${CMAKE_COMMAND} -E echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__GRAS__API.html'>\" > ${PROJECT_DIRECTORY}/doc/html/gras.html
-               COMMAND ${CMAKE_COMMAND} -E echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__GRAS__API.html'>Grid Reality And Simulation.</a></h2></center></html>\" >> ${PROJECT_DIRECTORY}/doc/html/gras.html
+               COMMAND ${CMAKE_COMMAND} -E echo "XX Post-processing Doxygen result"
+               COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/doc/html/dir*
+               COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/doxygen_postprocesser.pl
+               COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/index_php.pl index.php.in html/index.html index.php
                
-               COMMAND ${CMAKE_COMMAND} -E echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__AMOK__API.html'>\" > ${PROJECT_DIRECTORY}/doc/html/amok.html
-               COMMAND ${CMAKE_COMMAND} -E echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__AMOK__API.html'>Advanced Metacomputing Overlay Kit.</a></h2></center></html>\" >> ${PROJECT_DIRECTORY}/doc/html/amok.html
-
-               COMMAND ${CMAKE_COMMAND} -E echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__MSG__API.html'>\" > ${PROJECT_DIRECTORY}/doc/html/msg.html
-               COMMAND ${CMAKE_COMMAND} -E echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__MSG__API.html'>Meta SimGrid.</a></h2></center></html>\" >> ${PROJECT_DIRECTORY}/doc/html/msg.html
-
-               COMMAND ${CMAKE_COMMAND} -E echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__SD__API.html'>\" > ${PROJECT_DIRECTORY}/doc/html/simdag.html
-               COMMAND ${CMAKE_COMMAND} -E echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__SD__API.html'>DAG Simulator.</a></h2></center></html>\" >> ${PROJECT_DIRECTORY}/doc/html/simdag.html
-       )
-
-if(BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH)
-       ADD_CUSTOM_COMMAND(
-               OUTPUT ${PROJECT_DIRECTORY}/doc/publis_count.html
-               DEPENDS all.bib
-               COMMAND ${PROJECT_DIRECTORY}/tools/doxygen/bibtex2html_table_count.pl < ${PROJECT_DIRECTORY}/doc/all.bib > ${PROJECT_DIRECTORY}/doc/publis_count.html
-       )
-       add_dependencies(APPEND_DOC ${PROJECT_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}' ${PROJECT_DIRECTORY}/doc/all.bib -o ${PROJECT_DIRECTORY}/doc/publis_core.bib
-               COMMAND ${BIBTOOL_PATH}/bibtool -- 'select.by.string={category "extern"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' ${PROJECT_DIRECTORY}/doc/all.bib -o ${PROJECT_DIRECTORY}/doc/publis_extern.bib
-               COMMAND ${BIBTOOL_PATH}/bibtool -- 'select.by.string={category "intra"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' ${PROJECT_DIRECTORY}/doc/all.bib -o ${PROJECT_DIRECTORY}/doc/publis_intra.bib
+               COMMAND ${CMAKE_COMMAND} -E echo "XX Create shortcuts pages"
+               COMMAND ${CMAKE_COMMAND} -E echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__GRAS__API.html'>\" > ${CMAKE_HOME_DIRECTORY}/doc/html/gras.html
+               COMMAND ${CMAKE_COMMAND} -E echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__GRAS__API.html'>Grid Reality And Simulation.</a></h2></center></html>\" >> ${CMAKE_HOME_DIRECTORY}/doc/html/gras.html
+               
+               COMMAND ${CMAKE_COMMAND} -E echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__AMOK__API.html'>\" > ${CMAKE_HOME_DIRECTORY}/doc/html/amok.html
+               COMMAND ${CMAKE_COMMAND} -E echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__AMOK__API.html'>Advanced Metacomputing Overlay Kit.</a></h2></center></html>\" >> ${CMAKE_HOME_DIRECTORY}/doc/html/amok.html
+       
+               COMMAND ${CMAKE_COMMAND} -E echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__MSG__API.html'>\" > ${CMAKE_HOME_DIRECTORY}/doc/html/msg.html
+               COMMAND ${CMAKE_COMMAND} -E echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__MSG__API.html'>Meta SimGrid.</a></h2></center></html>\" >> ${CMAKE_HOME_DIRECTORY}/doc/html/msg.html
+       
+               COMMAND ${CMAKE_COMMAND} -E echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__SD__API.html'>\" > ${CMAKE_HOME_DIRECTORY}/doc/html/simdag.html
+               COMMAND ${CMAKE_COMMAND} -E echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__SD__API.html'>DAG Simulator.</a></h2></center></html>\" >> ${CMAKE_HOME_DIRECTORY}/doc/html/simdag.html
+               WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/
        )
 
-       foreach(file "publis_core publis_extern publis_intra")
-               ADD_CUSTOM_COMMAND(
-                       OUTPUT ${PROJECT_DIRECTORY}/doc/${file}.html
-                       DEPENDS "${file}.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
+
+               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 ${PROJECT_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(APPEND_DOC ${PROJECT_DIRECTORY}/doc/${file}.html)
-       endforeach(file "publis_core publis_extern publis_intra")
+       add_dependencies(simgrid_documentation bib_files)
        
-endif(BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH)
-
-endif(DOXYGEN_PATH AND FIG2DEV_PATH)
+else(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH AND GOOD_BIBTEX2HTML_VERSION)
+
+       ADD_CUSTOM_TARGET(simgrid_documentation
+                       COMMENT "Generating the SimGrid documentation..."
+                       )
+
+       if(NOT GOOD_BIBTEX2HTML_VERSION) # wrong version
+               ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
+                       COMMAND ${CMAKE_COMMAND} -E echo "This is not the good bibtex2html program !!!"
+                       COMMAND ${CMAKE_COMMAND} -E echo  "You can download it from:"
+                       COMMAND ${CMAKE_COMMAND} -E echo  "  ftp://ftp-sop.inria.fr/epidaure/Softs/bibtex2html/bibtex2html-1.02.tar.gz"
+                       COMMAND ${CMAKE_COMMAND} -E echo  "There is also an unofficial Debian/Ubuntu package, see:"
+                       COMMAND ${CMAKE_COMMAND} -E echo  "  http://www.loria.fr/~lnussbau/bibtex2html/README"
+                       )
+       endif(NOT GOOD_BIBTEX2HTML_VERSION)
+
+       ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
+                       COMMAND ${CMAKE_COMMAND} -E echo "DOXYGEN_PATH          = ${DOXYGEN_PATH}"
+                       COMMAND ${CMAKE_COMMAND} -E echo "FIG2DEV_PATH          = ${FIG2DEV_PATH}"
+                       COMMAND ${CMAKE_COMMAND} -E echo "BIBTOOL_PATH          = ${BIBTOOL_PATH}"
+                       COMMAND ${CMAKE_COMMAND} -E echo "BIBTEX2HTML_PATH      = ${BIBTEX2HTML_PATH}"
+                       COMMAND ${CMAKE_COMMAND} -E echo "ICONV_PATH            = ${ICONV_PATH}"
+                       COMMAND ${CMAKE_COMMAND} -E echo "IN ORDER TO GENERATE THE DOCUMENTATION YOU NEED ALL TOOLS !!!"
+                       COMMAND ${CMAKE_COMMAND} -E echo "FAIL TO MAKE SIMGRID DOCUMENTATION see previous messages for details ..."
+                       COMMAND false
+                       )
 
-ADD_CUSTOM_COMMAND(
-       OUTPUT ${PROJECT_DIRECTORY}/doc/logcategories.doc
-       DEPENDS ${source_doxygen}
-       COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/doc/logcategories.doc
-       COMMAND ${PROJECT_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl > ${PROJECT_DIRECTORY}/doc/logcategories.doc
-       WORKING_DIRECTORY ${PROJECT_DIRECTORY}
-)
+               
+endif(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH AND GOOD_BIBTEX2HTML_VERSION)
 
+##############################################################################"
 
-message("Check individual TOCs")
+message(STATUS "Check individual TOCs")
 file(GLOB_RECURSE LISTE_GTUT
-       "${PROJECT_DIRECTORY}/doc/gtut-tour-*.doc"
+       "${CMAKE_HOME_DIRECTORY}/doc/gtut-tour-*.doc"
 )
 foreach(file_name ${LISTE_GTUT})
-       file(REMOVE ${PROJECT_DIRECTORY}/doc/tmp.curtoc)
-       file(REMOVE ${PROJECT_DIRECTORY}/doc/tmp.realtoc)
+       file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc)
+       file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc)
        
        file(READ "${file_name}" file_content)
        string(REGEX MATCH "Table of Contents.*<hr>" valeur_line "${file_content}")
@@ -189,30 +187,30 @@ foreach(file_name ${LISTE_GTUT})
                        set(line2                               " - \\ref ${line2}")
                        string(REPLACE " - \\ref subsection"    "   - \\ref " line2 ${line2})
                        string(REPLACE " - \\ref subsubsection" "     - \\ref " line2 ${line2})
-                       file(APPEND ${PROJECT_DIRECTORY}/doc/tmp.realtoc "${line2}\n")
+                       file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc "${line2}\n")
                endif(line2 AND NOT line3)
        endforeach(line ${file_content})
        
        foreach(line ${valeur_line})
                string(REGEX MATCH ".*ref.*" line_ok ${line})
                if(line_ok)
-                       file(APPEND ${PROJECT_DIRECTORY}/doc/tmp.curtoc "${line_ok}\n")
+                       file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc "${line_ok}\n")
                endif(line_ok)
        endforeach(line ${valeur_line})
        
-       exec_program("${CMAKE_COMMAND} -E compare_files ${PROJECT_DIRECTORY}/doc/tmp.curtoc ${PROJECT_DIRECTORY}/doc/tmp.realtoc" OUTPUT_VARIABLE compare_files)
+       exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc" OUTPUT_VARIABLE compare_files)
        if(compare_files)
-               message("Wrong toc for ${file_name}. Should be:")
-               file(READ "${PROJECT_DIRECTORY}/doc/tmp.realtoc" file_content)
+               message(STATUS "Wrong toc for ${file_name}. Should be:")
+               file(READ "${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc" file_content)
                message("${file_content}")
-               exec_program("diff -u ${PROJECT_DIRECTORY}/doc/tmp.curtoc ${PROJECT_DIRECTORY}/doc/tmp.realtoc")
+               exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc")
         endif(compare_files)
 endforeach(file_name ${LISTE_GTUT})
 
-file(REMOVE ${PROJECT_DIRECTORY}/doc/tmp.curtoc)
-file(REMOVE ${PROJECT_DIRECTORY}/doc/tmp.realtoc)
+file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc)
+file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc)
 
-message("Check main TOC")
+message(STATUS "Check main TOC")
 
 foreach(file_name ${LISTE_GTUT})
        file(READ "${file_name}" file_content)  
@@ -226,7 +224,7 @@ foreach(file_name ${LISTE_GTUT})
                        string(REPLACE "@page " "" line2 "${line2}")
                        string(REGEX REPLACE " .*" "" line2 "${line2}")
                        set(line2 " - \\ref ${line2}")
-                       file(APPEND ${PROJECT_DIRECTORY}/doc/tmp.realtoc "${line2}\n")
+                       file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc "${line2}\n")
                endif(line2)
        endforeach(line ${file_content})
        
@@ -236,26 +234,26 @@ foreach(file_name ${LISTE_GTUT})
                string(REGEX MATCH "^[ ]*$" line3 "${line}")
                string(REGEX MATCH "Table of Contents" line4 "${line}")
                if(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4)
-                       file(APPEND ${PROJECT_DIRECTORY}/doc/tmp.realtoc "   ${line}\n")
+                       file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc "   ${line}\n")
                endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4)
        endforeach(line ${valeur_line})
 endforeach(file_name ${LISTE_GTUT})    
 
-file(READ "${PROJECT_DIRECTORY}/doc/gtut-tour.doc" file_content)
+file(READ "${CMAKE_HOME_DIRECTORY}/doc/gtut-tour.doc" file_content)
 string(REPLACE "\n" ";" file_content "${file_content}")
 foreach(line ${file_content})
        string(REGEX MATCH "^[ ]+.*\\ref" line1 "${line}")
        if(line1)
-               file(APPEND ${PROJECT_DIRECTORY}/doc/tmp.curtoc "${line}\n")
+               file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc "${line}\n")
        endif(line1)
 endforeach(line ${file_content})
        
-exec_program("${CMAKE_COMMAND} -E compare_files ${PROJECT_DIRECTORY}/doc/tmp.curtoc ${PROJECT_DIRECTORY}/doc/tmp.realtoc" OUTPUT_VARIABLE compare_files)
+exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc" OUTPUT_VARIABLE compare_files)
 if(compare_files)
-       message("Wrong toc for gtut-tour.doc Right one is in tmp.realtoc")
-       exec_program("diff -u ${PROJECT_DIRECTORY}/doc/tmp.curtoc ${PROJECT_DIRECTORY}/doc/tmp.realtoc")
+       message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc")
+       exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc")
 else(compare_files)
-       file(REMOVE ${PROJECT_DIRECTORY}/doc/tmp.realtoc)
+       file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.realtoc)
 endif(compare_files)   
   
-file(REMOVE ${PROJECT_DIRECTORY}/doc/tmp.curtoc)
\ No newline at end of file
+file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc)