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/Makefile.in b/Makefile.in
index 4331fa8bf1f9fb3f8f5b3fb2321c262157e0b367..ac80cb954a64383f08780181d92f9c7904f0de3c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,9 +81,9 @@ depend: depend_idl
 depend_idl:
        (cd idl ; $(MAKE) $@) || exit 1
 
-resources: share/salome/resources/VISUCatalog.xml
+resources: share/salome/resources/visu/VISUCatalog.xml
 
-share/salome/resources/VISUCatalog.xml: VISUCatalog.xml
+share/salome/resources/visu/VISUCatalog.xml: VISUCatalog.xml
        cp $< $@
 
 # doc is already build : if you want to had documents, go manually to doc and run 'make doc'
@@ -128,6 +128,6 @@ install: install-bin install-include install-end
 
 install-resources: install-catalog
 
-install-catalog: share/salome/resources/VISUCatalog.xml
-       $(INSTALL) -d $(datadir)/resources
-       $(INSTALL_DATA) $< $(datadir)/resources/.
+install-catalog: share/salome/resources/visu/VISUCatalog.xml
+       $(INSTALL) -d $(datadir)/resources/visu
+       $(INSTALL_DATA) $< $(datadir)/resources/visu/.

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index ed0e9c451f62afb99956129ae6ec29dbab0c88f1..bba7766f82c95313fa0fa7067530b3fbd0dac6cb 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/configure.in.base b/configure.in.base
index a07175245a0637e0b2b0ebec41366509edb20d20..0c57ce698b54db75c5c51415f58604a3c06f21cb 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=visu
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -343,7 +347,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/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 8fa38a99c559c035544266011dbe61888115921b..5488527cc80116efb353ae8fe1f2964896c0c2cb 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -59,8 +59,8 @@
     <parameter name="point_sprite_results"   value="true"/>
     <parameter name="point_sprite_primitive_type"  value="0"  />
     <parameter name="point_sprite_clamp"           value="256"/>
-    <parameter name="point_sprite_main_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/sprite_texture.bmp" />
-    <parameter name="point_sprite_alpha_texture"   value="${VISU_ROOT_DIR}/share/salome/resources/sprite_alpha.bmp" />
+    <parameter name="point_sprite_main_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_texture.bmp" />
+    <parameter name="point_sprite_alpha_texture"   value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_alpha.bmp" />
     <parameter name="point_sprite_alpha_threshold" value="0.5"/>
     <parameter name="point_sprite_min_size"      value="10" />
     <parameter name="point_sprite_max_size"      value="33" />
@@ -72,8 +72,8 @@
     <parameter name="geom_sphere_face_limit"     value="50000"/>
     <parameter name="inside_point_sprite_primitive_type"   value="0"  />
     <parameter name="inside_point_sprite_clamp"            value="256"/>
-    <parameter name="inside_point_sprite_main_texture"     value="${VISU_ROOT_DIR}/share/salome/resources/sprite_texture.bmp" />
-    <parameter name="inside_point_sprite_alpha_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/sprite_alpha.bmp" />
+    <parameter name="inside_point_sprite_main_texture"     value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_texture.bmp" />
+    <parameter name="inside_point_sprite_alpha_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_alpha.bmp" />
     <parameter name="inside_point_sprite_alpha_threshold"  value="0.5"/>
     <parameter name="inside_point_sprite_min_size"         value="10" />
     <parameter name="inside_point_sprite_max_size"         value="33" />
@@ -83,8 +83,8 @@
     <parameter name="inside_geom_sphere_face_limit"        value="50000"/>
     <parameter name="outside_point_sprite_primitive_type"  value="0"  />
     <parameter name="outside_point_sprite_clamp"           value="256"/>
-    <parameter name="outside_point_sprite_main_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/sprite_texture.bmp" />
-    <parameter name="outside_point_sprite_alpha_texture"   value="${VISU_ROOT_DIR}/share/salome/resources/sprite_alpha.bmp" />
+    <parameter name="outside_point_sprite_main_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_texture.bmp" />
+    <parameter name="outside_point_sprite_alpha_texture"   value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_alpha.bmp" />
     <parameter name="outside_point_sprite_alpha_threshold" value="0.5"/>
     <parameter name="outside_point_sprite_size"      value="25"  />
     <parameter name="outside_point_sprite_uniform"   value="true"/>
@@ -112,6 +112,6 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="VISU" value="${VISU_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="VISU" value="${VISU_ROOT_DIR}/share/salome/resources/visu"/>
   </section>
 </document>