From acad15c37e34c5892f882b056cd8d3112ea6b661 Mon Sep 17 00:00:00 2001 From: lbobelin Date: Fri, 29 Jun 2012 18:07:33 +0200 Subject: [PATCH] Ok, I forgot most of the examples in one of my previous commit. Repaired. --- buildtools/Cmake/DefinePackages.cmake | 1 + buildtools/Cmake/GenerateUserGuide.cmake | 7 ------- doc/user_guide/doxygen/UserGuideDoxyfile.in | 3 ++- doc/user_guide/doxygen/UserGuideDoxygenLayout.xml | 5 +++-- doc/user_guide/doxygen/install.doc | 2 +- doc/user_guide/doxygen/use.doc | 2 -- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index ba76e5836d..0bfdd0f932 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -587,6 +587,7 @@ set(USER_GUIDE_SOURCES doc/user_guide/doxygen/bindings.doc doc/user_guide/doxygen/options.doc doc/user_guide/doxygen/use.doc + doc/user_guide/doxygen/examples.doc doc/user_guide/doxygen/tracing.doc doc/user_guide/doxygen/pls.doc doc/user_guide/doxygen/index.doc diff --git a/buildtools/Cmake/GenerateUserGuide.cmake b/buildtools/Cmake/GenerateUserGuide.cmake index 124fdd2e49..c3363e3377 100644 --- a/buildtools/Cmake/GenerateUserGuide.cmake +++ b/buildtools/Cmake/GenerateUserGuide.cmake @@ -29,13 +29,6 @@ if(FIG2DEV_PATH) WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen ) - ADD_CUSTOM_COMMAND(TARGET user_guide - DEPENDS ${source_doxygen} - COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/user_guide/logcategories.doc - COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl > ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/logcategories.doc - WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} - ) - foreach(file ${DOC_FIGS}) string(REPLACE ".fig" ".png" tmp_file ${file}) string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/shared/fig/" "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/" tmp_file ${tmp_file}) diff --git a/doc/user_guide/doxygen/UserGuideDoxyfile.in b/doc/user_guide/doxygen/UserGuideDoxyfile.in index 9051a4f285..7927828d08 100644 --- a/doc/user_guide/doxygen/UserGuideDoxyfile.in +++ b/doc/user_guide/doxygen/UserGuideDoxyfile.in @@ -660,7 +660,8 @@ WARN_LOGFILE = INPUT = index.doc \ install.doc \ - use.doc \ + use.doc \ + examples.doc \ options.doc \ platform.doc \ tracing.doc \ diff --git a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml index e44aa5e45a..0d81217a84 100644 --- a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml +++ b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml @@ -4,7 +4,6 @@ - @@ -19,7 +18,9 @@ - + + + diff --git a/doc/user_guide/doxygen/install.doc b/doc/user_guide/doxygen/install.doc index 5048ab0c3b..9f34aba73b 100644 --- a/doc/user_guide/doxygen/install.doc +++ b/doc/user_guide/doxygen/install.doc @@ -1,4 +1,4 @@ -/*! \addtogroup SimGrid_install +/*! \page install Installing Simgrid \section install_cmake Installing the SimGrid library diff --git a/doc/user_guide/doxygen/use.doc b/doc/user_guide/doxygen/use.doc index b61246159e..4476e1985f 100644 --- a/doc/user_guide/doxygen/use.doc +++ b/doc/user_guide/doxygen/use.doc @@ -217,8 +217,6 @@ This initializes MSG, runs a simulation, and free all data-structures created by \include msg/small_platform.xml - - \section using_gras Using GRAS Here are some examples on how to use GRAS. -- 2.20.1