Ajout lien documentation

diff --git a/adm_local/make_common_starter.am b/adm_local/make_common_starter.am
index 487dbeac8fc57df447006ba0f0ca4ed914d587c2..f09fedf47c09041e09f24ffcf189af9113570c19 100644 (file)
--- a/adm_local/make_common_starter.am
+++ b/adm_local/make_common_starter.am
@@ -26,7 +26,7 @@ admlocalm4dir        = $(admlocaldir)/unix/config_files
 sharedpkgpythondir =$(pkgpythondir)/shared_modules
 
 # Documentation directory
-docdir             = $(datadir)/doc/salome/adao
+docdir             = $(datadir)/doc/salome/gui/ADAO
 
 IDL_INCLUDES = -I$(KERNEL_ROOT_DIR)/idl/salome
 KERNEL_LIBS= -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeContainer -lOpUtil -lSalomeDSCContainer -lSalomeDSCSuperv -lSalomeDatastream -lSalomeDSCSupervBasic -lCalciumC

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 88eda8c204897211d619df4477ff9f8e4e281ce2..793ecd66eff9b0dcaa167f06913f344a407a4e64 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,19 +1,21 @@
+include $(top_srcdir)/adm_local/make_common_starter.am
+
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = $(top_builddir)/doc/build
 
-EXTRA_DIST = main.rst conf.py
+EXTRA_DIST = main.rst intro.rst conf.py
 
 install-data-local:
        make html
        ${mkinstalldirs} $(DESTDIR)$(docdir)
-       cp -R $(BUILDDIR)/html $(DESTDIR)$(docdir)
+       cp -R $(BUILDDIR)/html/* $(DESTDIR)$(docdir)
 
 uninstall-local:
        chmod -R +w $(DESTDIR)$(docdir)
-       rm -rf $(DESTDIR)$(docdir)/html
+       rm -rf $(DESTDIR)$(docdir)
 
 clean-local:
        -rm -rf $(top_builddir)/doc/build

diff --git a/doc/index.rst b/doc/index.rst
index 667c83c76dbdbf876d4b83b38bf4917a84f4362e..bd3bbbea4301474c2bfc8772e834a8482ae9cecc 100644 (file)
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -5,7 +5,9 @@ ADAO documentation
 Contents:
 
 .. toctree::
-   :maxdepth: 2
+  :maxdepth: 2
+
+  intro
 
 Indices and tables
 ==================

diff --git a/doc/intro.rst b/doc/intro.rst
new file mode 100644 (file)
index 0000000..24bbf18
--- /dev/null
+++ b/doc/intro.rst
@@ -0,0 +1,4 @@
+Introduction à ADAO
++++++++++++++++++++
+
+todo

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 2414273c580df5bec9245086b8942b5f59c1a6e4..0f18b5157fc7b84f3a072fc51d706bd054e24e4b 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -3,9 +3,14 @@
     <!-- Major module parameters -->
     <parameter name="name"    value="ADAO"/>
     <parameter name="library" value="SalomePyQtGUI"/>
+    <parameter name="documentation" value="adao_help"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
     <parameter name="ADAO" value="${ADAO_ROOT_DIR}/share/salome/resources/adao"/>
   </section>
+  <section name="adao_help">
+    <parameter name="sub_menu"     value="%1 module"/>
+    <parameter name="User's Guide" value="${ADAO_ROOT_DIR}/share/doc/salome/gui/ADAO/index.html"/>
+  </section>
 </document>