From: André Ribes <andre.ribes@edf.fr>
Date: Thu, 23 Dec 2010 15:16:47 +0000 (+0100)
Subject: Ajout lien documentation
X-Git-Tag: V6_4_0rc3~105
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b0e6faa1e26eb61e6359705d7f3d998a4df0c064;p=modules%2Fadao.git

Ajout lien documentation
---

diff --git a/adm_local/make_common_starter.am b/adm_local/make_common_starter.am
index 487dbea..f09fedf 100644
--- 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 88eda8c..793ecd6 100644
--- 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 667c83c..bd3bbbe 100644
--- 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
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 2414273..0f18b51 100644
--- 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>