Merge branch 'master' of framagit.org:simgrid/simgrid

diff --cc .gitignore
Simple merge

diff --cc MANIFEST.in
index b2f3889,16fc6c9..53b252d
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -1738,7 -1738,6 +1738,10 @@@ include teshsuite/xbt/signals/signals.t
  include tools/MSG_visualization/colorize.pl
  include tools/MSG_visualization/trace2fig.pl
  include tools/address_sanitizer.supp
++<<<<<<< HEAD
 +include tools/doxygen/fig2dev_postprocessor.pl
++=======
++>>>>>>> 0e860ce2fbd8d2781d6c1129bb41cb788380f398
  include tools/fix-paje-trace.sh
  include tools/generate-dwarf-functions
  include tools/graphicator/graphicator.cpp
@@@ -2778,8 -2776,8 +2781,7 @@@ include tools/cmake/test_prog/prog_make
  include tools/cmake/test_prog/prog_stackgrowth.c
  include tools/cmake/test_prog/prog_stacksetup.c
  include tools/cmake/test_prog/prog_tsan.cpp
- include tools/doxygen/fig2dev_postprocessor.pl
  include tools/doxygen/list_routing_models_examples.sh
 -include tools/doxygen/xbt_log_extract_hierarchy.pl
  include tools/graphicator/CMakeLists.txt
  include tools/lualib.patch
  include tools/smpi/generate_smpi_defines.pl

diff --cc tools/cmake/DefinePackages.cmake
index 8676c72,e352971..fafbc4f
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -980,7 -978,7 +979,6 @@@ set(DOC_SOURCE
    )
  
  set(DOC_TOOLS
-   tools/doxygen/fig2dev_postprocessor.pl
 -  tools/doxygen/xbt_log_extract_hierarchy.pl
    tools/doxygen/list_routing_models_examples.sh
    )
  

diff --cc tools/cmake/Documentation.cmake
index df4b530,5659b92..d5a7979
--- 1/tools/cmake/Documentation.cmake
--- 2/tools/cmake/Documentation.cmake
+++ b/tools/cmake/Documentation.cmake
@@@ -53,8 -53,10 +53,7 @@@ if(enable_documentation
    endforeach()
  
    ADD_CUSTOM_COMMAND(TARGET documentation
-     COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${CMAKE_HOME_DIRECTORY}/doc/shared/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_BINARY_DIR}/doc/simgrid_modules.map
      COMMAND pwd
 -    COMMAND ${CMAKE_COMMAND} -E echo "XX Generate the index files"
 -    COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/doc/doxygen/logcategories.doc
 -    COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl ${CMAKE_HOME_DIRECTORY} > ${CMAKE_BINARY_DIR}/doc/doxygen/logcategories.doc
      COMMAND ${CMAKE_COMMAND} -E echo "XX Generate list of files in examples/ for routing models"
      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/doc/example_lists/
      COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/list_routing_models_examples.sh Floyd > ${CMAKE_BINARY_DIR}/doc/example_lists/example_filelist_routing_floyd