better rendering of simgrid_modules.png (and corrected font for TRACE module)

[simgrid.git] / buildtools / Cmake / GenerateDoc.cmake

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 1e152f7..c61d7ef 100644 (file)
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -27,8 +27,6 @@ endif(${OUTPUT_BIBTEX2HTML_VERSION_2} STREQUAL ${OUTPUT_BIBTEX2HTML_VERSION})
 
 if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSION)
 
-       string(REGEX REPLACE ";.*logcategories.doc" "" LISTE_DEUX "${LISTE_DEUX}")
-
        #DOC_SOURCE=doc/*.doc, defined in DefinePackage
        set(DOCSSOURCES "${source_doxygen}\n${DOC_SOURCE}")
        string(REPLACE "\n" ";" DOCSSOURCES ${DOCSSOURCES})
@@ -36,12 +34,15 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
 
        set(DOC_PNGS 
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo.png
+               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_small.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
+               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
+               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
        )
        
        configure_file(${CMAKE_HOME_DIRECTORY}/doc/Doxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/Doxyfile @ONLY)
@@ -68,7 +69,7 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
                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}
+                       COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng -S 4 ${file} ${tmp_file}
                )
        endforeach(file ${DOC_FIGS})
        
@@ -83,6 +84,7 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
                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/AS_hierarchy.png        ${CMAKE_HOME_DIRECTORY}/doc/html/          
                COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css                          ${CMAKE_HOME_DIRECTORY}/doc/html/
        )
        
@@ -90,7 +92,7 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
            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 pls.doc index.doc gtut-introduction.doc installSimgrid.doc bindings.doc options.doc tracing.doc
+               COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/toc_create.pl pls.doc index.doc FAQ.doc gtut-introduction.doc install.doc bindings.doc options.doc tracing.doc platform.doc
                
                COMMAND ${CMAKE_COMMAND} -E echo "XX Second Doxygen pass"
                COMMAND ${DOXYGEN_PATH}/doxygen Doxyfile