Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Clean the gtut files.
authornavarro <navarro@caraja.(none)>
Thu, 25 Oct 2012 12:09:24 +0000 (14:09 +0200)
committernavarro <navarro@caraja.(none)>
Thu, 25 Oct 2012 12:09:24 +0000 (14:09 +0200)
27 files changed:
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/Distrib.cmake
buildtools/Cmake/GenerateDoc.cmake
buildtools/Cmake/GenerateUserGuide.cmake
doc/gtut-files/gtut-howto-design.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-howto-design.doc with 100% similarity]
doc/gtut-files/gtut-howto.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-howto.doc with 100% similarity]
doc/gtut-files/gtut-introduction.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-introduction.doc with 100% similarity]
doc/gtut-files/gtut-main.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-main.doc with 100% similarity]
doc/gtut-files/gtut-tour-00-install.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-00-install.doc with 100% similarity]
doc/gtut-files/gtut-tour-01-bones.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-01-bones.doc with 100% similarity]
doc/gtut-files/gtut-tour-02-simple.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-02-simple.doc with 100% similarity]
doc/gtut-files/gtut-tour-03-args.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-03-args.doc with 100% similarity]
doc/gtut-files/gtut-tour-04-callback.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-04-callback.doc with 100% similarity]
doc/gtut-files/gtut-tour-05-globals.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-05-globals.doc with 100% similarity]
doc/gtut-files/gtut-tour-06-logs.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-06-logs.doc with 100% similarity]
doc/gtut-files/gtut-tour-07-timers.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-07-timers.doc with 100% similarity]
doc/gtut-files/gtut-tour-08-exceptions.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-08-exceptions.doc with 100% similarity]
doc/gtut-files/gtut-tour-09-simpledata.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-09-simpledata.doc with 100% similarity]
doc/gtut-files/gtut-tour-10-rpc.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-10-rpc.doc with 100% similarity]
doc/gtut-files/gtut-tour-11-explicitwait.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-11-explicitwait.doc with 100% similarity]
doc/gtut-files/gtut-tour-12-staticstruct.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-12-staticstruct.doc with 100% similarity]
doc/gtut-files/gtut-tour-13-pointers.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-13-pointers.doc with 100% similarity]
doc/gtut-files/gtut-tour-14-dynar.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-14-dynar.doc with 100% similarity]
doc/gtut-files/gtut-tour-15-manualdatadef.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-15-manualdatadef.doc with 100% similarity]
doc/gtut-files/gtut-tour-16-exchangecb.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-16-exchangecb.doc with 100% similarity]
doc/gtut-files/gtut-tour-recap-messages.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour-recap-messages.doc with 100% similarity]
doc/gtut-files/gtut-tour.doc [moved from doc/user_guide/doxygen/gtut-files/gtut-tour.doc with 100% similarity]

index a73dd99..7ce53ff 100644 (file)
@@ -686,9 +686,59 @@ set(USER_GUIDE_SOURCES
   doc/user_guide/doxygen/use.doc
   doc/user_guide/doxygen/stylesheet.css
   )
   doc/user_guide/doxygen/use.doc
   doc/user_guide/doxygen/stylesheet.css
   )
+  
+set(LISTE_GTUT
+    doc/gtut-files/gtut-tour-00-install.doc
+    doc/gtut-files/gtut-tour-01-bones.doc
+    doc/gtut-files/gtut-tour-02-simple.doc
+    doc/gtut-files/gtut-tour-03-args.doc
+    doc/gtut-files/gtut-tour-04-callback.doc
+    doc/gtut-files/gtut-tour-05-globals.doc
+    doc/gtut-files/gtut-tour-06-logs.doc
+    doc/gtut-files/gtut-tour-07-timers.doc
+    doc/gtut-files/gtut-tour-08-exceptions.doc
+    doc/gtut-files/gtut-tour-09-simpledata.doc
+    doc/gtut-files/gtut-tour-10-rpc.doc
+    doc/gtut-files/gtut-tour-11-explicitwait.doc
+    doc/gtut-files/gtut-tour-12-staticstruct.doc
+    doc/gtut-files/gtut-tour-13-pointers.doc
+    doc/gtut-files/gtut-tour-14-dynar.doc
+    doc/gtut-files/gtut-tour-15-manualdatadef.doc
+    doc/gtut-files/gtut-tour-16-exchangecb.doc
+    doc/gtut-files/gtut-tour.doc
+    doc/gtut-files/gtut-tour-recap-messages.doc
+  )
 
 
+set(EXTRA_LISTE_GTUT
+    doc/gtut-files/01-bones.output
+    doc/gtut-files/02-simple.output
+    doc/gtut-files/03-args.output
+    doc/gtut-files/03-args.xml
+    doc/gtut-files/04-callback.output
+    doc/gtut-files/05-globals.output
+    doc/gtut-files/06-logs.output
+    doc/gtut-files/06-logs.output.error
+    doc/gtut-files/06-logs.output.fmt
+    doc/gtut-files/06-logs.output.fmt-bt
+    doc/gtut-files/06-logs.output.verbose
+    doc/gtut-files/07-timers.output
+    doc/gtut-files/08-exceptions.output
+    doc/gtut-files/09-simpledata.output
+    doc/gtut-files/10-rpc.output
+    doc/gtut-files/11-explicitwait.output
+    doc/gtut-files/11-explicitwait.xml
+    doc/gtut-files/gtut-howto-design.doc
+    doc/gtut-files/gtut-howto.doc
+    doc/gtut-files/gtut-introduction.doc
+    doc/gtut-files/gtut-main.doc
+    doc/gtut-files/gtut-platform-3nodes.xml
+    doc/gtut-files/gtut-platform.xml
+    doc/gtut-files/README
+    doc/gtut-files/test.xml
+    )
+  
 set(REF_GUIDE_SOURCES
 set(REF_GUIDE_SOURCES
-  doc/ref_guide/index-API.doc
+  doc/ref_guide/doxygen/index-API.doc
   doc/ref_guide/doxygen/footer.html
   doc/ref_guide/doxygen/header.html
   doc/ref_guide/doxygen/main.doc
   doc/ref_guide/doxygen/footer.html
   doc/ref_guide/doxygen/header.html
   doc/ref_guide/doxygen/main.doc
index 4b63cd9..70faceb 100644 (file)
@@ -216,6 +216,8 @@ set(source_to_pack
   ${DOC_IMG}
   ${DOC_SOURCES}
   ${DOC_GTUT_SRC}
   ${DOC_IMG}
   ${DOC_SOURCES}
   ${DOC_GTUT_SRC}
+  ${LISTE_GTUT}
+  ${EXTRA_LISTE_GTUT}
   ${DOC_TOOLS}
   ${DOC_SHARED_TAG}
   ${REF_GUIDE_SOURCES}
   ${DOC_TOOLS}
   ${DOC_SHARED_TAG}
   ${REF_GUIDE_SOURCES}
index 0d46ff1..18c0ae9 100644 (file)
@@ -107,3 +107,101 @@ add_custom_target(sync-gforge-dtd
   COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid.dtd
   WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
   )
   COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid.dtd
   WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
   )
+
+##############################################################################"
+# GTUT FILES
+
+#message(STATUS "Check individual TOCs")
+
+#foreach(file_name ${LISTE_GTUT})
+#   file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc)
+#   file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc)
+#
+#   file(READ "${file_name}" file_content)
+#   string(REGEX MATCH "Table of Contents.*<hr>" valeur_line "${file_content}")
+#   string(REPLACE "\n" ";" valeur_line "${valeur_line}")
+#   string(REPLACE "\n" ";" file_content "${file_content}")
+#
+#   file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "\n") # make sure it exists
+#   foreach(line ${file_content})
+#       string(REGEX MATCH "[\\]s?u?b?s?u?b?section.*" line2 "${line}")
+#       string(REGEX MATCH ".*_toc.*" line3 "${line}")
+#       if(line2 AND NOT line3)
+#           string(REPLACE "\\section " "" line2 ${line2})
+#           string(REPLACE "\\subsection " "subsection" line2 ${line2})
+#           string(REPLACE "\\subsubsection " "subsubsection" line2 ${line2})
+#           string(REGEX REPLACE " .*" "" line2 ${line2})
+#           set(line2                               " - \\ref ${line2}")
+#           string(REPLACE " - \\ref subsection"    "   - \\ref " line2 ${line2})
+#           string(REPLACE " - \\ref subsubsection" "     - \\ref " line2 ${line2})
+#           file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "${line2}\n")
+#       endif(line2 AND NOT line3)
+#   endforeach(line ${file_content})
+#
+#   file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "\n") # make sure it exists
+#   foreach(line ${valeur_line})
+#       string(REGEX MATCH ".*ref.*" line_ok ${line})
+#       if(line_ok)
+#           file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "${line_ok}\n")
+#       endif(line_ok)
+#   endforeach(line ${valeur_line})
+#
+#   exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files)
+#   if(compare_files)
+#       message(STATUS "Wrong toc for ${file_name}. Should be:")
+#       file(READ "${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" file_content)
+#       message("${file_content}")
+#       exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc")
+#        endif(compare_files)
+#endforeach(file_name ${LISTE_GTUT})
+#
+#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc)
+#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc)
+#
+#message(STATUS "Check main TOC")
+#
+#foreach(file_name ${LISTE_GTUT})
+#   file(READ "${file_name}" file_content)
+#   string(REGEX MATCH "Table of Contents.*<hr>" valeur_line "${file_content}")
+#   string(REPLACE "\n" ";" valeur_line "${valeur_line}")
+#   string(REPLACE "\n" ";" file_content "${file_content}")
+#
+#   foreach(line ${file_content})
+#       string(REGEX MATCH ".*@page.*" line2 "${line}")
+#       if(line2)
+#           string(REPLACE "@page " "" line2 "${line2}")
+#           string(REGEX REPLACE " .*" "" line2 "${line2}")
+#           set(line2 " - \\ref ${line2}")
+#           file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "${line2}\n")
+#       endif(line2)
+#   endforeach(line ${file_content})
+#
+#   foreach(line ${valeur_line})
+#       string(REGEX MATCH ".*toc.*" line1 "${line}")
+#       string(REGEX MATCH ".*<hr>.*" line2 "${line}")
+#       string(REGEX MATCH "^[ ]*$" line3 "${line}")
+#       string(REGEX MATCH "Table of Contents" line4 "${line}")
+#       if(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4)
+#           file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "   ${line}\n")
+#       endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4)
+#   endforeach(line ${valeur_line})
+#endforeach(file_name ${LISTE_GTUT})
+#
+#file(READ "${CMAKE_HOME_DIRECTORY}/doc/doxygen/gtut-tour.doc" file_content)
+#string(REPLACE "\n" ";" file_content "${file_content}")
+#foreach(line ${file_content})
+#   string(REGEX MATCH "^[ ]+.*\\ref" line1 "${line}")
+#   if(line1)
+#       file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "${line}\n")
+#   endif(line1)
+#endforeach(line ${file_content})
+#
+#exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files)
+#if(compare_files)
+#   message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc")
+#   exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc")
+#else(compare_files)
+#   file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc)
+#endif(compare_files)
+#
+#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc)
\ No newline at end of file
index 9014e95..72a3861 100644 (file)
@@ -82,123 +82,6 @@ else(FIG2DEV_PATH)
 
 endif(FIG2DEV_PATH)
 
 
 endif(FIG2DEV_PATH)
 
-##############################################################################"
-
-#message(STATUS "Check individual TOCs")
-#set(LISTE_GTUT
-#      doc/user_guide/doxygen/gtut-tour-00-install.doc
-#      doc/user_guide/doxygen/gtut-tour-01-bones.doc
-#      doc/user_guide/doxygen/gtut-tour-02-simple.doc
-#      doc/user_guide/doxygen/gtut-tour-03-args.doc
-#      doc/user_guide/doxygen/gtut-tour-04-callback.doc
-#      doc/user_guide/doxygen/gtut-tour-05-globals.doc
-#      doc/user_guide/doxygen/gtut-tour-06-logs.doc
-#      doc/user_guide/doxygen/gtut-tour-07-timers.doc
-#      doc/user_guide/doxygen/gtut-tour-08-exceptions.doc
-#      doc/user_guide/doxygen/gtut-tour-09-simpledata.doc
-#      doc/user_guide/doxygen/gtut-tour-10-rpc.doc
-#      doc/user_guide/doxygen/gtut-tour-11-explicitwait.doc
-#      doc/user_guide/doxygen/gtut-tour-recap-messages.doc
-#      doc/user_guide/doxygen/gtut-tour-12-staticstruct.doc
-#      doc/user_guide/doxygen/gtut-tour-13-pointers.doc
-#      doc/user_guide/doxygen/gtut-tour-14-dynar.doc
-#      doc/user_guide/doxygen/gtut-tour-15-manualdatadef.doc
-#      doc/user_guide/doxygen/gtut-tour-16-exchangecb.doc
-#)
-#
-#foreach(file_name ${LISTE_GTUT})
-#      file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc)
-#      file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc)
-#
-#      file(READ "${file_name}" file_content)
-#      string(REGEX MATCH "Table of Contents.*<hr>" valeur_line "${file_content}")
-#      string(REPLACE "\n" ";" valeur_line "${valeur_line}")
-#      string(REPLACE "\n" ";" file_content "${file_content}")
-#
-#      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "\n") # make sure it exists
-#      foreach(line ${file_content})
-#              string(REGEX MATCH "[\\]s?u?b?s?u?b?section.*" line2 "${line}")
-#              string(REGEX MATCH ".*_toc.*" line3 "${line}")
-#              if(line2 AND NOT line3)
-#                      string(REPLACE "\\section " "" line2 ${line2})
-#                      string(REPLACE "\\subsection " "subsection" line2 ${line2})
-#                      string(REPLACE "\\subsubsection " "subsubsection" line2 ${line2})
-#                      string(REGEX REPLACE " .*" "" line2 ${line2})
-#                      set(line2                               " - \\ref ${line2}")
-#                      string(REPLACE " - \\ref subsection"    "   - \\ref " line2 ${line2})
-#                      string(REPLACE " - \\ref subsubsection" "     - \\ref " line2 ${line2})
-#                      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "${line2}\n")
-#              endif(line2 AND NOT line3)
-#      endforeach(line ${file_content})
-#
-#      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "\n") # make sure it exists
-#      foreach(line ${valeur_line})
-#              string(REGEX MATCH ".*ref.*" line_ok ${line})
-#              if(line_ok)
-#                      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "${line_ok}\n")
-#              endif(line_ok)
-#      endforeach(line ${valeur_line})
-#
-#      exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files)
-#      if(compare_files)
-#              message(STATUS "Wrong toc for ${file_name}. Should be:")
-#              file(READ "${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc" file_content)
-#              message("${file_content}")
-#              exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc")
-#        endif(compare_files)
-#endforeach(file_name ${LISTE_GTUT})
-#
-#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc)
-#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc)
-#
-#message(STATUS "Check main TOC")
-#
-#foreach(file_name ${LISTE_GTUT})
-#      file(READ "${file_name}" file_content)
-#      string(REGEX MATCH "Table of Contents.*<hr>" valeur_line "${file_content}")
-#      string(REPLACE "\n" ";" valeur_line "${valeur_line}")
-#      string(REPLACE "\n" ";" file_content "${file_content}")
-#
-#      foreach(line ${file_content})
-#              string(REGEX MATCH ".*@page.*" line2 "${line}")
-#              if(line2)
-#                      string(REPLACE "@page " "" line2 "${line2}")
-#                      string(REGEX REPLACE " .*" "" line2 "${line2}")
-#                      set(line2 " - \\ref ${line2}")
-#                      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "${line2}\n")
-#              endif(line2)
-#      endforeach(line ${file_content})
-#
-#      foreach(line ${valeur_line})
-#              string(REGEX MATCH ".*toc.*" line1 "${line}")
-#              string(REGEX MATCH ".*<hr>.*" line2 "${line}")
-#              string(REGEX MATCH "^[ ]*$" line3 "${line}")
-#              string(REGEX MATCH "Table of Contents" line4 "${line}")
-#              if(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4)
-#                      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "   ${line}\n")
-#              endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4)
-#      endforeach(line ${valeur_line})
-#endforeach(file_name ${LISTE_GTUT})
-#
-#file(READ "${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/gtut-tour.doc" file_content)
-#string(REPLACE "\n" ";" file_content "${file_content}")
-#foreach(line ${file_content})
-#      string(REGEX MATCH "^[ ]+.*\\ref" line1 "${line}")
-#      if(line1)
-#              file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "${line}\n")
-#      endif(line1)
-#endforeach(line ${file_content})
-#
-#exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files)
-#if(compare_files)
-#      message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc")
-#      exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc")
-#else(compare_files)
-#      file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc)
-#endif(compare_files)
-#
-#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc)
-
 ADD_CUSTOM_TARGET(user_guide_pdf
     COMMAND ${CMAKE_COMMAND} -E echo "XX First pass simgrid_user_guide.pdf"
     COMMAND make clean
 ADD_CUSTOM_TARGET(user_guide_pdf
     COMMAND ${CMAKE_COMMAND} -E echo "XX First pass simgrid_user_guide.pdf"
     COMMAND make clean