production automatique en cmake de la doc tutoriel pdf

diff --git a/doc/salome/gui/HYDRO/input/mainpage.doc b/doc/salome/gui/HYDRO/input/mainpage.doc
index 65ac01737e6fa9374f069c3cbada51ce321e685e..5c393f6ebd1c160c79336d729ce278a3b1cf15c1 100644 (file)
--- a/doc/salome/gui/HYDRO/input/mainpage.doc
+++ b/doc/salome/gui/HYDRO/input/mainpage.doc
@@ -9,7 +9,7 @@
 
   <b>The HYDRO documentation is divided in two parts:</b>
   - <b>the reference documentation below </b>
-  - <b>a Tutorial in French:</b> <A HREF="../HYDRO_tutorial/index.html">Here </A>
+  - <b>a Tutorial in French:</b> <A HREF="../HYDRO_tutorial/index.html">Here </A> or <A HREF="../HYDRO_tutorial/moduleHYDRO_tutoriel.pdf">pdf </A>
   
 
   The HYDRO GUI project has been developed for a hydrodynamic laboratory in the EDF R&D company

diff --git a/doc/salome/tutorial/CMakeLists.txt b/doc/salome/tutorial/CMakeLists.txt
index 30b13cfcc017213cd985e7b5ae2221e2654854c5..847d2e8370940201adc10421bdaba24c5af724ee 100644 (file)
--- a/doc/salome/tutorial/CMakeLists.txt
+++ b/doc/salome/tutorial/CMakeLists.txt
@@ -56,15 +56,17 @@ ADD_CUSTOM_TARGET(BUILD_HTML ALL
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
   
-# ADD_CUSTOM_TARGET(BUILD_PDF ALL
-#   COMMAND ${CMAKE_COMMAND} -E make_directory latex 
-#   COMMAND ${SPHINX_EXECUTABLE} -c ${CMAKE_BINARY_DIR}/doc/salome/tutorial -b latex ${ALLSPHINXOPTS} latex
-#   COMMAND make -C latex all-pdf
-#   DEPENDS ${RSTFILES}
-#   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-# )
+ADD_CUSTOM_TARGET(BUILD_PDF ALL
+  COMMAND ${CMAKE_COMMAND} -E make_directory latex 
+  COMMAND ${SPHINX_EXECUTABLE} -c ${CMAKE_BINARY_DIR}/doc/salome/tutorial -b latex ${ALLSPHINXOPTS} latex
+  COMMAND make -C latex all-pdf
+  DEPENDS ${RSTFILES}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ 
   DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO_tutorial
   PATTERN ".buildinfo" EXCLUDE
 )
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/latex/moduleHYDRO_tutoriel.pdf DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO_tutorial)

diff --git a/doc/salome/tutorial/conf.py.in b/doc/salome/tutorial/conf.py.in
index be103a76e874942b1822254cd51ac0928848c70b..b5763e7bc2d7eb75de732ccadd908aaa7b934395 100644 (file)
--- a/doc/salome/tutorial/conf.py.in
+++ b/doc/salome/tutorial/conf.py.in
@@ -56,7 +56,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'HYDRO module'
+project = u'module HYDRO'
 copyright = u'2015-2016, EDF'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -65,10 +65,10 @@ copyright = u'2015-2016, EDF'
 #
 # The short X.Y version.
 #version = '@SALOMEHYDRO_VERSION@'
-version = 'V7_6'
+version = '7.6'
 # The full version, including alpha/beta/rc tags.
 #release = '@SALOMEHYDRO_VERSION@'
-release = 'V7_6-2015.12.18'
+release = '7.6-2015.12.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -179,7 +179,7 @@ html_static_path = ['_static']
 #html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-#htmlhelp_basename = 'HYDROmoduledoc'
+htmlhelp_basename = 'module_HYDRO_tutoriel'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -199,8 +199,8 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'HYDROmodule.tex', u'HYDRO module Documentation',
-   u'EDF RD', 'manual'),
+  ('index', 'moduleHYDRO_tutoriel.tex', u'module HYDRO Documentation',
+   u'EDF', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of