From: navarro Date: Wed, 20 Jun 2012 09:44:00 +0000 (+0200) Subject: Fix link between doc pages and redo the sync target X-Git-Tag: v3_8~563^2~1 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/548af375ebc6d5d1d3ea1cb9ee236f2c13b26aec Fix link between doc pages and redo the sync target --- diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index ff78eeaf6a..b4892041d8 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -393,27 +393,6 @@ WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" ### Fill in the "make sync-gforge" target ### ############################################# -### TODO: LBO: CHECK IF CORRECT -add_custom_target(sync-gforge-doc -COMMAND chmod g+rw -R doc/ -COMMAND chmod a+rX -R doc/ -COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ || true -COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times -doc/user_guide/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/doc/user_guide || true -COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times -doc/ref_guide/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/doc/ref_guide || true -COMMAND scp doc/user_guide/html/simgrid_modules2.png doc/user_guide/html/simgrid_modules.png doc/webcruft/simgrid_logo_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 user_guide) -add_dependencies(sync-gforge-doc ref_guide) - -add_custom_target(sync-gforge-dtd -COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/simgrid.dtd -COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid.dtd -WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" -) - #PIPOL add_custom_target(sync-pipol COMMAND scp -r Experimental_bindings.sh Experimental.sh MemCheck.sh pre-simgrid.sh navarro@pipol.inria.fr:~/ diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake index 8a72b2513f..6856a07c7d 100644 --- a/buildtools/Cmake/GenerateDoc.cmake +++ b/buildtools/Cmake/GenerateDoc.cmake @@ -74,3 +74,34 @@ if(DOXYGEN_PATH) endif(DOXYGEN_MAJOR_VERSION STRLESS "2" AND DOXYGEN_MINOR_VERSION STRLESS "8") endif(DOXYGEN_PATH) + +############################################# +### Fill in the "make sync-gforge" target ### +############################################# + +### TODO: LBO: CHECK IF CORRECT +add_custom_target(sync-gforge-doc +COMMAND chmod g+rw -R doc/ +COMMAND chmod a+rX -R doc/ +COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ || true +COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/ || true +COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/ || true +COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/html/ || true +COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/html/ || true +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 rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times +doc/user_guide/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/html/ || true +COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times +doc/ref_guide/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/html || true +COMMAND scp doc/user_guide/html/simgrid_modules2.png doc/user_guide/html/simgrid_modules.png doc/webcruft/simgrid_logo_2011.png +doc/webcruft/simgrid_logo_2011_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) + +add_custom_target(sync-gforge-dtd +COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/simgrid.dtd +COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid.dtd +WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" +) diff --git a/doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml b/doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml index 14ad23a152..4482d2ffac 100644 --- a/doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml +++ b/doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml @@ -11,7 +11,7 @@ - + diff --git a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml index 1432381d0d..e44aa5e45a 100644 --- a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml +++ b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml @@ -20,7 +20,7 @@ - +