Make simgrid doc with new logo name

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index bf28e63..18674f0 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -664,7 +664,7 @@ set(DOC_SOURCES
        doc/webcruft/Paje_MSG_screenshot.jpg
        doc/webcruft/Paje_MSG_screenshot_thn.jpg
        doc/webcruft/poster_thumbnail.png
        doc/webcruft/Paje_MSG_screenshot.jpg
        doc/webcruft/Paje_MSG_screenshot_thn.jpg
        doc/webcruft/poster_thumbnail.png

-       doc/webcruft/simgrid_logo.png
+       doc/webcruft/simgrid_logo_2011.png

        doc/webcruft/simgrid_logo_small.png
        doc/triva-graph_configuration.png
        doc/triva-graph_visualization.png
        doc/webcruft/simgrid_logo_small.png
        doc/triva-graph_configuration.png
        doc/triva-graph_visualization.png

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index c7a3285..22c570a 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -332,7 +332,7 @@ COMMAND chmod g+rw -R doc/
 COMMAND chmod a+rX -R doc/
 COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times 
 doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/doc/ || true
 COMMAND chmod a+rX -R doc/
 COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times 
 doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/doc/ || true

-COMMAND scp doc/html/simgrid_modules2.png doc/html/simgrid_modules.png doc/webcruft/simgrid_logo.png  doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/
+COMMAND scp doc/html/simgrid_modules2.png doc/html/simgrid_modules.png doc/webcruft/rm _2011.png  doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/

 WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
 )
 add_dependencies(sync-gforge-doc simgrid_documentation)
 WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
 )
 add_dependencies(sync-gforge-doc simgrid_documentation)

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index a8a9126..21f403f 100644 (file)
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -33,7 +33,6 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
 
 
        set(DOC_PNGS 
 
 
        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/simgrid_logo_2011.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_small.png
                ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png