Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
move the user manual one layer higher, so that all manuals are merged back
authorMartin Quinson <martin.quinson@loria.fr>
Thu, 6 Dec 2012 11:00:42 +0000 (12:00 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Thu, 6 Dec 2012 20:24:00 +0000 (21:24 +0100)
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/Distrib.cmake
buildtools/Cmake/GenerateDoc.cmake
buildtools/Cmake/GenerateUserGuide.cmake
doc/Doxyfile.in
doc/Layout.xml [moved from doc/doxygen/UserGuideDoxygenLayout.xml with 100% similarity]
doc/attic/SimgridDoxygenLayout.xml [moved from doc/SimgridDoxygenLayout.xml with 100% similarity]
doc/doxygen/header.html
doc/index.doc [deleted file]
doc/webcruft/README [deleted file]
doc/webcruft/simgrid_modules.png [new file with mode: 0644]

index 48f6dbc..8824b7f 100644 (file)
@@ -507,9 +507,8 @@ set(DOC_SOURCES
   doc/simix.fig
   doc/surf_nutshell.fig
   doc/Doxyfile.in
-  doc/index.doc
   doc/simgrid.css
-  doc/SimgridDoxygenLayout.xml
+  doc/Layout.xml
   doc/triva-graph_configuration.png
   doc/triva-graph_visualization.png
   doc/triva-time_interval.png
index 88f8c8a..e8acb78 100644 (file)
@@ -5,7 +5,6 @@
 # doc
 file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/shared/doxygen/)
 file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
-file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
 
 install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/"
   DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/ref_guide/html/"
index d70d56a..d35e037 100644 (file)
@@ -18,8 +18,16 @@ if(DOXYGEN_PATH)
   include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDevGuide.cmake)
 
   set(DOC_PNGS
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_modules.png
     ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
     ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
     )
 
   configure_file(${CMAKE_HOME_DIRECTORY}/doc/Doxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/Doxyfile @ONLY)
@@ -44,8 +52,10 @@ if(DOXYGEN_PATH)
     )
 
   ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
-    COMMAND ${CMAKE_COMMAND} -E echo "XX Doxygen pass"
+    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_HOME_DIRECTORY}/doc/simgrid_modules.map
+    COMMAND ${CMAKE_COMMAND} -E echo "XX Run doxygen"
     COMMAND ${DOXYGEN_PATH}/doxygen Doxyfile
+    COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/simgrid_modules.map
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
     )
 
@@ -71,7 +81,6 @@ if(DOXYGEN_PATH)
     add_dependencies(simgrid_documentation error_doxygen)
   else()
     add_dependencies(simgrid_documentation ref_guide)
-    add_dependencies(simgrid_documentation user_guide)
     add_dependencies(simgrid_documentation dev_guide)
   endif()
 
@@ -85,13 +94,9 @@ endif()
 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}/dev_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 ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/dev_guide/html/ || true
+  COMMAND ssh scm.gforge.inria.fr mkdir -p /home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/html/ || true
+  COMMAND ssh scm.gforge.inria.fr mkdir -p /home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/html/ || true
+  COMMAND ssh scm.gforge.inria.fr mkdir -p /home/groups/simgrid/htdocs/simgrid/${release_version}/dev_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
index 3f72487..cd091c2 100644 (file)
@@ -6,17 +6,6 @@ file(GLOB_RECURSE source_doxygen
   )
 
 if(FIG2DEV_PATH)
-  set(DOC_PNGS
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
-    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
-    )
 
   configure_file(${CMAKE_HOME_DIRECTORY}/doc/doxygen/UserGuideDoxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/doxygen/UserGuideDoxyfile @ONLY)
 
index 05b659a..605b62e 100644 (file)
@@ -41,7 +41,7 @@ PROJECT_NUMBER         = @release_version@
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Scalable simulation of distributed systems"
+PROJECT_BRIEF          = "Versatile Simulation of Distributed Systems"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
@@ -586,7 +586,7 @@ FILE_VERSION_FILTER    =
 # You can optionally specify a file name after the option, if omitted
 # DoxygenLayout.xml will be used as the name of the layout file.
 
-LAYOUT_FILE            = SimgridDoxygenLayout.xml
+LAYOUT_FILE            = Layout.xml
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files
 # containing the references data. This must be a list of .bib files. The
@@ -658,8 +658,56 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = index.doc
-                         
+INPUT                  = doxygen/index.doc \
+                         doxygen/getting_started.doc \
+                         doxygen/introduction.doc \
+                         doxygen/install.doc \
+                         doxygen/use.doc \   
+                           doxygen/platform.doc \
+                           doxygen/deployment.doc \
+                           doxygen/options.doc \
+                           doxygen/help.doc \
+                        doxygen/advanced.doc \
+                           doxygen/pls.doc \
+                           doxygen/bindings.doc \
+                          doxygen/internals.doc \
+                          doxygen/involved.doc \
+                         doxygen/examples.doc \            
+                         doxygen/tracing.doc \
+                        doxygen/FAQ.doc
+
+###################################################
+##  PLEASE DON'T MESS WITH THE ORDER OF EXAMPLES ## (unless you know what you are doing, of course)
+###################################################
+
+INPUT +=                 @top_srcdir@/examples/msg/sendrecv/sendrecv.c \
+                         @top_srcdir@/examples/msg/masterslave/masterslave_forwarder.c \
+                         @top_srcdir@/examples/msg/masterslave/masterslave_console.c \
+                         @top_srcdir@/examples/msg/migration \
+                         @top_srcdir@/examples/msg/suspend \
+                         @top_srcdir@/examples/msg/properties \
+                         @top_srcdir@/examples/msg/parallel_task \
+                         @top_srcdir@/examples/msg/priority \
+                         @top_srcdir@/examples/msg/icomms/peer.c \
+                         @top_srcdir@/examples/msg/icomms/peer2.c \
+                         @top_srcdir@/examples/msg/icomms/peer3.c \
+                         @top_srcdir@/examples/msg/tracing/simple.c \
+                         @top_srcdir@/examples/msg/tracing/ms.c \
+                         @top_srcdir@/examples/msg/tracing/categories.c \
+                         @top_srcdir@/examples/msg/tracing/procmig.c \
+                         @top_srcdir@/examples/msg/tracing/trace_platform.c \
+                         @top_srcdir@/examples/msg/tracing/user_variables.c \
+                         @top_srcdir@/examples/msg/tracing/link_user_variables.c \
+                         @top_srcdir@/examples/msg/tracing/link_srcdst_user_variables.c \
+                         @top_srcdir@/examples/msg/ns3 \
+                         @top_srcdir@/examples/msg/gtnets \
+                         @top_srcdir@/examples/msg/io \
+                         @top_srcdir@/examples/msg/gpu \
+                         @top_srcdir@/examples/msg/actions \
+                         @top_srcdir@/examples/msg/token_ring \
+                         @top_srcdir@/examples/msg/pmm \
+                         @top_srcdir@/examples/msg/chord
+
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
@@ -742,7 +790,8 @@ EXAMPLE_RECURSIVE      = YES
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = @top_srcdir@/doc
+IMAGE_PATH             = @top_srcdir@/doc \
+                         @top_srcdir@/doc/webcruft
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -891,13 +940,13 @@ HTML_FILE_EXTENSION    = .html
 # have to redo this when upgrading to a newer version of doxygen or when
 # changing the value of configuration settings such as GENERATE_TREEVIEW!
 
-HTML_HEADER            =
+HTML_HEADER            = doxygen/header.html 
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            = doxygen/footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
@@ -906,7 +955,7 @@ HTML_FOOTER            =
 # the style sheet file to the HTML output directory, so don't put your own
 # style sheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        =
+HTML_STYLESHEET        = doxygen/stylesheet.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1122,7 +1171,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # navigation tree you can set this option to NO if you already set
 # GENERATE_TREEVIEW to YES.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information.
@@ -1134,7 +1183,7 @@ DISABLE_INDEX          = NO
 # Since the tree basically has the same information as the tab index you
 # could consider to set DISABLE_INDEX to NO when enabling this option.
 
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
 # (range [0,1..20]) that doxygen will group on one line in the generated HTML
@@ -1300,7 +1349,7 @@ LATEX_BATCHMODE        = NO
 # include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
-LATEX_HIDE_INDICES     = NO
+LATEX_HIDE_INDICES     = YES
 
 # If LATEX_SOURCE_CODE is set to YES then doxygen will include
 # source code with syntax highlighting in the LaTeX output.
@@ -1556,13 +1605,13 @@ SKIP_FUNCTION_MACROS   = YES
 # doxygen is run, you must also specify the path to the tagfile here.
 
 TAGFILES               = shared/doxygen/simgridrefguide.tag=ref_guide/html/ \ 
-                         shared/doxygen/simgriduserguide.tag=user_guide/html/ \
                          shared/doxygen/simgriddevguide.tag=dev_guide/html/
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = simgrid.tag 
+#GENERATE_TAGFILE       = simgrid.tag 
+GENERATE_TAGFILE       = 
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes
index 446c929..00e49a8 100644 (file)
@@ -49,14 +49,10 @@ $mathjax
 
 <div id="navrow1" class="tabs">
     <ul class="tablist">
-      <li><a href="../../doc/index.html"><span>Home</span></a></li>
-      <li><a href="../../ref_guide/html/index.html"><span>Reference&nbsp;Manual</span></a></li>
-      <li class="current"><a href="../../user_guide/html/index.html"><span>User&nbsp;Guide</span></a></li>
-      <li><a href="../../dev_guide/html/index.html"><span>Developer&nbsp;Guide</span></a></li>
+      <li><a href="http://simgrid.gforge.inria.fr/"><span>Home page</span></a></li>
       <li><a href="http://simgrid.gforge.inria.fr/tutorials.html"><span>Tutorials</span></a></li>
-      <li><a href="https://gforge.inria.fr/projects/simgrid"><span>Forge</span></a></li>
-      <li><a href="http://simgrid.gforge.inria.fr/"><span>Website</span></a></li>
+      <li><a href="https://gforge.inria.fr/projects/simgrid"><span>Dev's Corner</span></a></li>
       <li>$searchbox</li>
     </ul>
-  </div>
+  </div> 
 <!-- end header part -->
diff --git a/doc/index.doc b/doc/index.doc
deleted file mode 100644 (file)
index f1e7019..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*! 
-@mainpage
-
-\htmlonly
-<center>
-<table width="100%">
-       <tr>
-               <td valign="middle" align="left">
-               </td>
-               <td valign="middle" align="left">
-               </td>
-       </tr>
-</table>
-</center>
-
-Currently, the documentation contains 3 main sections:
-<ul>
-  <li><h2><a href="../user_guide/html/index.html">SimGrid User Guide</a></h2></li>
-  <li><h2><a href="../ref_guide/html/index.html">SimGrid Reference Manual</a>.</h2></li>
-  <li><h2><a href="../dev_guide/html/index.html">SimGrid Developer Manual</a>.</h2></li>
-  <li><h2>You can also retrieve tutorials from <a href="http://simgrid.gforge.inria.fr/tutorials.html">here</a>.</h2></li> 
-</ul>
-\endhtmlonly
-Other information sources: 
-  - The official webpage is <a href="http://simgrid.gforge.inria.fr/">simgrid.gforge.inria.fr</a>.
-  - The Frequently Asked Questions are <a href="http://simgrid.gforge.inria.fr/simgrid/latest/doc/FAQ.html">here</a>.
-  - The development webpage is <a href="https://gforge.inria.fr/projects/simgrid//">gforge.inria.fr/projects/simgrid</a>.
-  - The user mailing list is <simgrid-user@lists.gforge.inria.fr>
-  - The SimGrid software package can be downloaded from <a href="http://simgrid.gforge.inria.fr/download.html">here</a>.
-
-\htmlonly
-<center>
-<a href="http://creativecommons.org/licenses/LGPL/2.1/"><img alt="CC-GNU LGPL" border="0" src="http://creativecommons.org/images/public/cc-LGPL-a.png" /></a>
-</center>
-\endhtmlonly
-
-*/
diff --git a/doc/webcruft/README b/doc/webcruft/README
deleted file mode 100644 (file)
index 3810136..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-The sources of the SimGrid 101 presentation are in the propagenda
-section. The script to generate the pngs from the pdf are on Martin's
-hard disk only (sorry). Here are the interesting bits of it:
-
-error=0
-for n in `seq 0 $NUM` ; do
- if [ x$n != x$NUM ] ; then # lame. should iterate over [0,NUM-1] the  proper way
-   m=`expr $n + 1`
-   echo -n "Page $m of $NUM... ";
-   file=${PNGDIR}_`printf %03d $m`.png
-   if [ ! -e $file ] || [ $file -ot ${PDF} ] ; then
-     convert -density 400% "${PDF}[$n]" -resize 30% $file || error=1 
-     echo "converted"
-   else
-     echo "kept previous version"
-   fi
- fi
-done
-                
\ No newline at end of file
diff --git a/doc/webcruft/simgrid_modules.png b/doc/webcruft/simgrid_modules.png
new file mode 100644 (file)
index 0000000..ea48102
Binary files /dev/null and b/doc/webcruft/simgrid_modules.png differ