Fix to bug PAL10465.

Modification of resource files location in "build" and "installation" directories.  Now resource files are placed in share/salome/resources/<module_name>.  Various configuration files (configure.in.base, make_module/conclude/commence, etc.) are changed.

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 71df450535eca5a9cea89302ac0b005bf8e9f910..0be66a96fb85c1e9b7c11ba350e90d34b8c3e31c 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -1,6 +1,8 @@
 # common directories to put headerfiles
 inc_builddir=$(top_builddir)/include/salome
 
+MODULE_NAME=@MODULE_NAME@
+
 @SET_MAKE@
 SHELL=/bin/sh
 

diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in
index 37c65077f50d3343f86ce031312d98616ac43172..554b8afb0c1b84af31d42a2a07f72f2eec228fa9 100644 (file)
--- a/adm_local/unix/make_conclude.in
+++ b/adm_local/unix/make_conclude.in
@@ -131,7 +131,7 @@ $(DEST_HEADERS): $(inc_builddir)/%: %
        cp -f $< $@
 
 # build resources file (icons and messages) : .qm file from .po file
-resources: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm)
+resources: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm)
 
 # Make installation directories if they don't exist.
 $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir):
@@ -187,10 +187,10 @@ $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: %
 
 # generic rule to install .qm files :
 install-qm: resources
-       $(INSTALL) -d $(datadir)/resources
-       @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm); do \
+       $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME)
+       @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \
           if test $$f != X; then                                                        \
-            ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1);                     \
+            ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1);                      \
           fi;                                                                           \
        done
 
@@ -234,7 +234,7 @@ uninstall:
 # Uninstall qm files
        @for f in X $(PO_FILES:%.po=%.qm); do         \
           if test $$f != X; then                                             \
-            $(LT_UNINSTALL) $(datadir)/resources/$$f ;                       \
+            $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ;                        \
           fi;                                                                \
        done
 
@@ -279,7 +279,7 @@ clean: mostlyclean
 #
 distclean: clean
        #remove qm file !
-       -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm)
+       -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm)
        #remove include files
        -$(RM) $(DEST_HEADERS)
        -$(RM) $(DISTCLEAN) *.bak *.old *.new .dep*
@@ -326,7 +326,7 @@ distclean: clean
 %_wrap.cxx : %.i
        $(SWIG) $(SWIG_FLAGS) -o $@ $<
 
-$(top_builddir)/share/salome/resources/%.qm: %.po
+$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm: %.po
                $(MSG2QM) $< $@ ; \
 
 #------------------------------------------------------------------------------

diff --git a/configure.in.base b/configure.in.base
index cc915a12021b74f44c979944be2710ccc8f9baf4..7ef7fd3876e103fd7cc85c27fdfad067def13ba3 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -27,6 +27,10 @@ XVERSION=0x030200
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=smesh
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -350,7 +354,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep

diff --git a/doc/salome/PluginMeshers.txt b/doc/salome/PluginMeshers.txt
index 61bb0842be1cfa0abbb92d8b2a9d491b3f33cf3c..802f096effcfc208783435917e1006efef01d8a3 100644 (file)
--- a/doc/salome/PluginMeshers.txt
+++ b/doc/salome/PluginMeshers.txt
@@ -83,10 +83,10 @@
         
         The SALOME automatically locates XML files, searching them in the following directories:
 
-         ${<PLUGINNAME>_ROOT_DIR}/share/salome/resources
+         ${<PLUGINNAME>_ROOT_DIR}/share/salome/resources/<plugin>
          ${SALOME_<PluginName>Resources}
          ${HOME}/.salome/resources
-         ${KERNEL_ROOT_DIR}/share/salome/resources
+         ${KERNEL_ROOT_DIR}/share/salome/resources/kernel
 
         where <PluginName> is a name of each mesher plugin package
 
@@ -148,7 +148,7 @@
         4.2.2. Define environment variable SALOME_<MyResourceKey>Resources to point to the 
                directory where resources are situated.
 
-               Example: setenv SALOME_StdMeshersResources ${SMESH_ROOT_DIR}/share/salome/resources
+               Example: setenv SALOME_StdMeshersResources ${SMESH_ROOT_DIR}/share/salome/resources/smesh
 
    4.3. Implement your Hypothesis Creator and being exported method
 

diff --git a/doc/salome/tui/SMESH/sources/static/PluginMeshers.html b/doc/salome/tui/SMESH/sources/static/PluginMeshers.html
index f860aef7b4f299c1338d7d126a1c1582c3fb0841..64c368819a4aca340cedffc758cdb5ff00fd3eda 100755 (executable)
--- a/doc/salome/tui/SMESH/sources/static/PluginMeshers.html
+++ b/doc/salome/tui/SMESH/sources/static/PluginMeshers.html
@@ -202,10 +202,10 @@ SMESH module.<br>
 The SALOME automatically locates XML files, searching them in the following
 directories:<br>
   <tt><br>
-&nbsp;&nbsp;&nbsp; ${&lt;PLUGINNAME&gt;_ROOT_DIR}/share/salome/resources<br>
+&nbsp;&nbsp;&nbsp; ${&lt;PLUGINNAME&gt;_ROOT_DIR}/share/salome/resources/&lt;pluginname&gt;<br>
 &nbsp;&nbsp;&nbsp; ${SALOME_&lt;PluginName&gt;Resources}<br>
 &nbsp;&nbsp;&nbsp; ${HOME}/.salome/resources<br>
-&nbsp;&nbsp;&nbsp; ${KERNEL_ROOT_DIR}/share/salome/resources</tt><br>
+&nbsp;&nbsp;&nbsp; ${KERNEL_ROOT_DIR}/share/salome/resources/kernel</tt><br>
   <br>
 where &lt;PluginName&gt; is a name of each mesher plugin package<br>
 </blockquote>
@@ -280,7 +280,7 @@ See paragraph 2 for definition of MyResourceKey, MyHypType1, MyAlgType1.<tt><br>
 <h5> <a name="2_4_2_2"></a>2.4.2.2. Define environment variable SALOME_&lt;MyResourceKey&gt;Resources</h5>
 <blockquote>It should point to the directory where resources are situated.</blockquote>
   
-<blockquote><tt>Example: setenv SALOME_StdMeshersResources ${SMESH_ROOT_DIR}/share/salome/resources</tt></blockquote>
+<blockquote><tt>Example: setenv SALOME_StdMeshersResources ${SMESH_ROOT_DIR}/share/salome/resources/smesh</tt></blockquote>
   
 <h4> <a name="2_4_3"></a>2.4.3. Implement your Hypothesis Creator and being
 exported method</h4>

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 3b4db83caac8a79c61b3f36375eb67d6a79b7c3d..4125b6ca2937c3c1d51d78f00d2f3f19bc10846b 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -41,7 +41,7 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="SMESH"      value="${SMESH_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="StdMeshers" value="${SMESH_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="SMESH"      value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
+    <parameter name="StdMeshers" value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
   </section>
 </document>