Fix link between doc pages and redo the sync target

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index ff78eea..b489204 100644 (file)
--- 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 8a72b25..6856a07 100644 (file)
--- 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 14ad23a..4482d2f 100644 (file)
--- a/doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml
+++ b/doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml
@@ -11,7 +11,7 @@
       <tab type="classmembers" visible="yes" title="" intro=""/>
     </tab>
     
-    <tab type="user" visible="yes" url="../../html/index.html" title="Home"/>
+    <tab type="user" visible="yes" url="../../doc/index.html" title="Home"/>
     <tab type="mainpage" visible="no" title="Reference Manual"/>
     <tab type="user" url="../../user_guide/html/index.html" title="User Guide"/>  
     <tab type="user" url="http://simgrid.gforge.inria.fr/101/index.php" title="Tutorials"/>

diff --git a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
index 1432381..e44aa5e 100644 (file)
--- a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
+++ b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
@@ -20,7 +20,7 @@
       <tab type="globals" visible="yes" title="" intro=""/>
     </tab>
 
-    <tab type="user" visible="yes" url="../../html/index.html" title="Home"/>
+    <tab type="user" visible="yes" url="../../doc/index.html" title="Home"/>
     <tab type="user" url="../../ref_guide/html/index.html" title="Reference Manual"/>
     <tab type="mainpage" visible="no" title="User Guide"/>
     <tab type="user" url="http://simgrid.gforge.inria.fr/101/index.php" title="Tutorials"/>