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/DEPRECATED/configure.in.base b/DEPRECATED/configure.in.base
index 1567a6394ecc18ae85f21ecb42e93831a7456e80..6a42ccbcba70b7a8d20a0d998fc9b14e9c6fb893 100644 (file)
--- a/DEPRECATED/configure.in.base
+++ b/DEPRECATED/configure.in.base
@@ -27,6 +27,10 @@ AC_SUBST(VERSION)
 XVERSION=0x030200
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=kernel
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -412,8 +416,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
-do
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl
 #   if test ! -d $rep ; then
 #      eval mkdir $rep
 #   fi

diff --git a/bin/appli_install.sh b/bin/appli_install.sh
index 3e7c53f70393087d6aeffad397296cd2780c527e..37da0092e3f7378245cc3e064426702e83bd9ea0 100644 (file)
--- a/bin/appli_install.sh
+++ b/bin/appli_install.sh
@@ -78,8 +78,7 @@ echo "export PYHELLO_ROOT_DIR=$APPLI_ROOT" >> env.d/configSalome.sh
 
 # --- GUI config
 
-echo "export config_var=$APPLI_ROOT:$APPLI_ROOT/share/salome/resources" >> env.d/configGUI.sh
-echo "export SUITRoot=$APPLI_ROOT/share/salome" >> env.d/configGUI.sh
+echo "export config_var=$APPLI_ROOT:$APPLI_ROOT/share/salome/resources/gui" >> env.d/configGUI.sh
 
 # --- SAMPLES directory
 

diff --git a/bin/appliskel/README b/bin/appliskel/README
index f3f283cb8810a1ace8a842401179cd59866096d2..644da212258868b1388dc73d4fda6075571bf126 100644 (file)
--- a/bin/appliskel/README
+++ b/bin/appliskel/README
@@ -90,7 +90,7 @@ CatalogRessources.xml
 
 SalomeApp.xml
    This file is similar to the default given
-   in ${GUI_ROOT_DIR}/share/salome/resources
+   in ${GUI_ROOT_DIR}/share/salome/resources/gui
 
 
 Proposal for env.d scripts

diff --git a/bin/appliskel/SalomeApp.xml b/bin/appliskel/SalomeApp.xml
index 6897b713607193038a97d3cd8e43d258c4c75408..7caea4e037d724228ba3e7037fde60c1813b1085 100644 (file)
--- a/bin/appliskel/SalomeApp.xml
+++ b/bin/appliskel/SalomeApp.xml
@@ -26,28 +26,28 @@
     <parameter name="translators" value="%P_msg_%L.qm|%P_icons.qm|%P_images.qm"/>
   </section>
   <section name="resources">
-    <parameter name="SUIT"         value="${SUITRoot}/resources"/>
-    <parameter name="STD"          value="${SUITRoot}/resources"/>
-    <parameter name="Plot2d"       value="${SUITRoot}/resources"/>
-    <parameter name="SPlot2d"      value="${SUITRoot}/resources"/>
-    <parameter name="GLViewer"     value="${SUITRoot}/resources"/>
-    <parameter name="OCCViewer"    value="${SUITRoot}/resources"/>
-    <parameter name="VTKViewer"    value="${SUITRoot}/resources"/>
-    <parameter name="SalomeApp"    value="${SUITRoot}/resources"/>
-    <parameter name="OB"           value="${SUITRoot}/resources"/>
-    <parameter name="CAM"          value="${SUITRoot}/resources"/>
-    <parameter name="GEOM"         value="${GEOM_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="SMESH"        value="${SMESH_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="VISU"         value="${VISU_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="SUPERV"       value="${SUPERV_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="MED"          value="${MED_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="StdMeshers"   value="${SMESH_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="NETGENPlugin" value="${NETGENPLUGIN_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="GHS3DPlugin"  value="${GHS3DPLUGIN_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="COMPONENT"    value="${COMPONENT_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="PYHELLO"      value="${PYHELLO_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="PYCALCULATOR" value="${PYCALCULATOR_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="LIGHT"        value="${LIGHT_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="SUIT"         value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="STD"          value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="Plot2d"       value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="SPlot2d"      value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="GLViewer"     value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="OCCViewer"    value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="VTKViewer"    value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="SalomeApp"    value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="OB"           value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="CAM"          value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="GEOM"         value="${GEOM_ROOT_DIR}/share/salome/resources/geom"/>
+    <parameter name="SMESH"        value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
+    <parameter name="VISU"         value="${VISU_ROOT_DIR}/share/salome/resources/visu"/>
+    <parameter name="SUPERV"       value="${SUPERV_ROOT_DIR}/share/salome/resources/superv"/>
+    <parameter name="MED"          value="${MED_ROOT_DIR}/share/salome/resources/med"/>
+    <parameter name="StdMeshers"   value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
+    <parameter name="NETGENPlugin" value="${NETGENPLUGIN_ROOT_DIR}/share/salome/resources/netgenplugin"/>
+    <parameter name="GHS3DPlugin"  value="${GHS3DPLUGIN_ROOT_DIR}/share/salome/resources/ghs3dplugin"/>
+    <parameter name="COMPONENT"    value="${COMPONENT_ROOT_DIR}/share/salome/resources/component"/>
+    <parameter name="PYHELLO"      value="${PYHELLO_ROOT_DIR}/share/salome/resources/pyhello"/>
+    <parameter name="PYCALCULATOR" value="${PYCALCULATOR_ROOT_DIR}/share/salome/resources/pycalculator"/>
+    <parameter name="LIGHT"        value="${LIGHT_ROOT_DIR}/share/salome/resources/light"/>
 
   </section>
   <section name="GEOM">

diff --git a/bin/appliskel/env.d/envSalome.sh b/bin/appliskel/env.d/envSalome.sh
index 5a6c6c48ea153ddde42ce9134402f2a0c505a5f0..ca620c35e24a45d69a0e1593a6b1ff4d7c6a4369 100644 (file)
--- a/bin/appliskel/env.d/envSalome.sh
+++ b/bin/appliskel/env.d/envSalome.sh
@@ -29,9 +29,8 @@ REPINST=/home/prascle/SALOME2/Install
 export KERNEL_ROOT_DIR=${REPINST}/KERNEL_V301
 
 export GUI_ROOT_DIR=${REPINST}/GUI_V301
-#export SalomeAppConfig=${GUI_ROOT_DIR}/share/salome/resources
+#export SalomeAppConfig=${GUI_ROOT_DIR}/share/salome/resources/gui
 export SalomeAppConfig=${HOME}/${APPLI}
-export SUITRoot=${GUI_ROOT_DIR}/share/salome
 
 export GEOM_ROOT_DIR=${REPINST}/GEOM_V301
 export MED_ROOT_DIR=${REPINST}/MED_V301

diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py
index f4bea5ff02d0391ab1aaed2fe3bf5f74e95781b8..4379642a8a7d101d8853cf8ca09c1ee877537fff 100755 (executable)
--- a/bin/launchConfigureParser.py
+++ b/bin/launchConfigureParser.py
@@ -227,14 +227,10 @@ class xml_parser:
 config_var = appname+'Config'
 # set resources variables if not yet set
 if os.getenv("GUI_ROOT_DIR"):
-    if not os.getenv("SUITRoot"):
-        os.environ["SUITRoot"] = os.getenv("GUI_ROOT_DIR") + "/share/salome"
     if not os.getenv(config_var):
-        os.environ[config_var] = os.getenv("GUI_ROOT_DIR") + "/share/salome/resources"
+        os.environ[config_var] = os.getenv("GUI_ROOT_DIR") + "/share/salome/resources/gui"
     pass
 else :
-    if not os.getenv("SUITRoot"):
-        os.environ["SUITRoot"] = ""
     if not os.getenv(config_var):
         os.environ[config_var] = ""
 
@@ -441,5 +437,5 @@ if 't' in cmd_opts:
 dirs = re.split('[;|:]', os.environ[config_var] )
 for m in args[modules_nam]:
     if m not in ["KERNEL", "GUI", ""] and os.getenv("%s_ROOT_DIR"%m):
-        dirs.append( os.getenv("%s_ROOT_DIR"%m) +  "/share/salome/resources" )
+        dirs.append( os.getenv("%s_ROOT_DIR"%m) +  "/share/salome/resources/" + m.lower() )
 os.environ[config_var] = ":".join(dirs)

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 9f0732b9cbc60247a2a979848d8b959f9f017839..2c2c9fc022671bf36831a86207243dde60bd5c90 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -24,7 +24,7 @@ import orbmodule
 
 process_id = {}
 
-# salome_subdir variable is used for composing paths like $KERNEL_ROOT_DIR/share/salome/resources, etc.
+# salome_subdir variable is used for composing paths like $KERNEL_ROOT_DIR/share/salome/resources/kernel, etc.
 # before moving to SUIT-based gui, instead of salome_subdir there was args['appname'] used.
 # but after - 'appname'  = "SalomeApp", so using it in making the subdirectory is an error.
 salome_subdir = "salome"
@@ -172,7 +172,7 @@ def set_env(args, modules_list, modules_root_dir):
         os.environ["SMESH_MeshersList"]="StdMeshers"
         if not os.environ.has_key("SALOME_StdMeshersResources"):
             os.environ["SALOME_StdMeshersResources"] \
-            = modules_root_dir["SMESH"]+"/share/"+args["appname"]+"/resources"
+            = modules_root_dir["SMESH"]+"/share/"+args["appname"]+"/resources/smesh"
             pass
         if args.has_key("SMESH_plugins"):
             for plugin in args["SMESH_plugins"]:
@@ -190,7 +190,7 @@ def set_env(args, modules_list, modules_root_dir):
                     = os.environ["SMESH_MeshersList"]+":"+plugin
                     if not os.environ.has_key("SALOME_"+plugin+"Resources"):
                         os.environ["SALOME_"+plugin+"Resources"] \
-                        = plugin_root+"/share/"+args["appname"]+"/resources"
+                        = plugin_root+"/share/"+args["appname"]+"/resources/"+plugin.lower()
                     add_path(os.path.join(plugin_root,"lib",python_version,
                                           "site-packages",salome_subdir),
                              "PYTHONPATH")
@@ -210,28 +210,27 @@ def set_env(args, modules_list, modules_root_dir):
     # set resources variables if not yet set
     # Done now by launchConfigureParser.py
     #if os.getenv("GUI_ROOT_DIR"):
-        #if not os.getenv("SUITRoot"): os.environ["SUITRoot"] =  os.getenv("GUI_ROOT_DIR") + "/share/salome"
-        #if not os.getenv("SalomeAppConfig"): os.environ["SalomeAppConfig"] =  os.getenv("GUI_ROOT_DIR") + "/share/salome/resources"
+        #if not os.getenv("SalomeAppConfig"): os.environ["SalomeAppConfig"] =  os.getenv("GUI_ROOT_DIR") + "/share/salome/resources/gui"
 
     # set CSF_PluginDefaults variable only if it is not customized
     # by the user
     if not os.getenv("CSF_PluginDefaults"):
         os.environ["CSF_PluginDefaults"] \
         = os.path.join(modules_root_dir["KERNEL"],"share",
-                       salome_subdir,"resources")
+                       salome_subdir,"resources","kernel")
     os.environ["CSF_SALOMEDS_ResourcesDefaults"] \
     = os.path.join(modules_root_dir["KERNEL"],"share",
-                   salome_subdir,"resources")
+                   salome_subdir,"resources","kernel")
 
     if "GEOM" in modules_list:
         print "GEOM OCAF Resources"
         os.environ["CSF_GEOMDS_ResourcesDefaults"] \
         = os.path.join(modules_root_dir["GEOM"],"share",
-                       salome_subdir,"resources")
+                       salome_subdir,"resources","geom")
        print "GEOM Shape Healing Resources"
         os.environ["CSF_ShHealingDefaults"] \
         = os.path.join(modules_root_dir["GEOM"],"share",
-                       salome_subdir,"resources")
+                       salome_subdir,"resources","geom")
 
 # -----------------------------------------------------------------------------
 
@@ -357,7 +356,8 @@ class CatalogServer(Server):
                 cata_path.extend(
                     glob.glob(os.path.join(module_root_dir,
                                            "share",salome_subdir,
-                                           "resources",module_cata)))
+                                           "resources",module.lower(),
+                                           module_cata)))
                 pass
             pass
         self.CMD=self.SCMD1 + [string.join(cata_path,':')] + self.SCMD2
@@ -470,7 +470,7 @@ class SessionServer(Server):
             cata_path.extend(
                 glob.glob(os.path.join(module_root_dir,"share",
                                        salome_subdir,"resources",
-                                       module_cata)))
+                                       module.lower(),module_cata)))
         if (self.args["gui"]) & ('moduleCatalog' in self.args['embedded']):
             self.CMD=self.SCMD1 + [string.join(cata_path,':')] + self.SCMD2
         else:
@@ -511,7 +511,7 @@ class ContainerManagerServer(Server):
                 cata_path.extend(
                     glob.glob(os.path.join(module_root_dir,"share",
                                            self.args['appname'],"resources",
-                                           module_cata)))
+                                           module.lower(),module_cata)))
                 pass
             pass
         if (self.args["gui"]) & ('moduleCatalog' in self.args['embedded']):
@@ -526,7 +526,7 @@ class NotifyServer(Server):
         self.modules_root_dir=modules_root_dir
         myLogName = os.environ["LOGNAME"]
         self.CMD=['notifd','-c',
-                  self.modules_root_dir["KERNEL"] +'/share/salome/resources/channel.cfg',
+                  self.modules_root_dir["KERNEL"] +'/share/salome/resources/kernel/channel.cfg',
                   '-DFactoryIORFileName=/tmp/'+myLogName+'_rdifact.ior',
                   '-DChannelIORFileName=/tmp/'+myLogName+'_rdichan.ior',
                   '-DReportLogFile=/tmp/'+myLogName+'_notifd.report',

diff --git a/configure.ac b/configure.ac
index 0161290f100f119d381a91c1a0eddd3a29512645..6fe4e801fe95338ae724e3276713425050e9871f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,10 @@ XVERSION=0x030200
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=kernel
+AC_SUBST(MODULE_NAME)
+
 echo
 echo ---------------------------------------------
 echo Initialize source and build root directories

diff --git a/doc/SALOME_Application.txt b/doc/SALOME_Application.txt
index 736f50add05d8408df233e8af5ef077c9be6846e..ab6c52b96cc544ea5877f8f8bf062511a3fc4af0 100644 (file)
--- a/doc/SALOME_Application.txt
+++ b/doc/SALOME_Application.txt
@@ -180,7 +180,7 @@ Other configuration files
 
 SalomeApp.xml
    This file is similar to the default given
-   in ${GUI_ROOT_DIR}/share/salome/resources
+   in ${GUI_ROOT_DIR}/share/salome/resources/gui
 
 
 CatalogRessources.xml

diff --git a/doc/salome/version.texi b/doc/salome/version.texi
index f9a81011e18cc7d2832e537f7ceddba986bef8a3..b787234408bf0c8c13dbf1f4f09495ebbc1255c1 100644 (file)
--- a/doc/salome/version.texi
+++ b/doc/salome/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 31 May 2006
-@set UPDATED-MONTH May 2006
+@set UPDATED 2 June 2006
+@set UPDATED-MONTH June 2006
 @set EDITION 3.2.0
 @set VERSION 3.2.0

diff --git a/salome_adm/unix/DEPRECATED/make_commence.in b/salome_adm/unix/DEPRECATED/make_commence.in
index 55199bf365de265547ccb23d1346052f1bb216ee..7b0ac204366ffb51699b67a881aca0598ee31de3 100644 (file)
--- a/salome_adm/unix/DEPRECATED/make_commence.in
+++ b/salome_adm/unix/DEPRECATED/make_commence.in
@@ -9,6 +9,7 @@ SHELL=@SHELL@
 
 HAVE_SSTREAM=@HAVE_SSTREAM@
 
+MODULE_NAME=@MODULE_NAME@
 
 LIBS=@LIBS@ 
 LIBSFORBIN=@LIBS@

diff --git a/salome_adm/unix/DEPRECATED/make_conclude.in b/salome_adm/unix/DEPRECATED/make_conclude.in
index 9583f49d4235d5881920c784e740efc2e9d84200..7a75995dc7247ec986e3364f5c88c8b23a8020a6 100644 (file)
--- a/salome_adm/unix/DEPRECATED/make_conclude.in
+++ b/salome_adm/unix/DEPRECATED/make_conclude.in
@@ -164,11 +164,11 @@ RESOURCES_FILES ?= $(RESOURCES_FILES_ALL)
 
 resources: resources-po resources-cp 
 
-resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm)
+resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm)
 
-resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
+resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%)
 
-$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
+$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%): $(top_builddir)/share/salome/resources/$(MODULE_NAME)/% : %
        cp -fr $< $@;
 
 # Make installation directories if they don't exist.
@@ -228,19 +228,19 @@ $(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
 
 # generic rule to install resources files (png, ini ...):
 install-res: resources
-       $(INSTALL) -d $(datadir)/resources
-       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%); do \
+       $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME)
+       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \
           if test $$f != X; then                                                        \
-            ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1);                     \
+            ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1);                      \
           fi;                                                                           \
        done  
 
@@ -291,7 +291,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
 
@@ -336,7 +336,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*
@@ -383,7 +383,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/salome_adm/unix/DEPRECATED/make_module.in b/salome_adm/unix/DEPRECATED/make_module.in
index bb26129cb9da88e228a6caa8afbfb5754b870589..2231eed78d7cb16a9d40354c30dade12dc90c94c 100644 (file)
--- a/salome_adm/unix/DEPRECATED/make_module.in
+++ b/salome_adm/unix/DEPRECATED/make_module.in
@@ -56,9 +56,9 @@ resources: resources-cp
           (cd $$d && $(MAKE) $@) || exit 1;    \
        done
 
-resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
+resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%)
 
-$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
+$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%): $(top_builddir)/share/salome/resources/$(MODULE_NAME)/% : %
        cp -fr $< $@;
 
 #data:
@@ -104,15 +104,15 @@ distclean: clean
        @@SETX@; for d in $(SUBDIRS); do        \
           (cd $$d && $(MAKE) $@) || exit 1;    \
        done
-       -$(RM) $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
+       -$(RM) $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%)
        -$(RM) Makefile
 
 install-resources: resources-cp
 # one resources directory for all salome modules
-       $(INSTALL) -d $(datadir)/resources
-       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%); do \
+       $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME)
+       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \
           if test $$f != X; then                                                        \
-            ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1);                     \
+            ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1);                      \
           fi;                                                                           \
        done
 
@@ -120,7 +120,7 @@ install-resources: resources-cp
 uninstall-resources:
        @for f in X $(RESOURCES_FILES); do            \
           if test $$f != X; then                                             \
-            $(LT_UNINSTALL) $(datadir)/resources/$$f ;                       \
+            $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ;                        \
           fi;                                                                \
        done
 

diff --git a/salome_adm/unix/make_common_starter.am b/salome_adm/unix/make_common_starter.am
index 220be3f5ead6e451916d02ff1c63a12c43584db7..007845b44249b1505955a9aa92583ba54c214d45 100644 (file)
--- a/salome_adm/unix/make_common_starter.am
+++ b/salome_adm/unix/make_common_starter.am
@@ -16,7 +16,7 @@ salomescriptdir    = $(bindir)
 salomeidldir       = $(prefix)/idl/@PACKAGE@
 
 # Directory for installing resource files
-salomeresdir       = $(prefix)/share/@PACKAGE@/resources
+salomeresdir       = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
 
 # Directories for installing admin files
 salomeadmdir       = $(prefix)/salome_adm

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 9e9c57da4f6561812db93e3eda81876ab0d92b00..992b565f7cf3c48560a185445cf3e9561184be44 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -66,7 +66,7 @@ SALOME_ResourcesManager(CORBA::ORB_ptr orb,
  *  - if ${APPLI} exists in environment,
  *    look for ${HOME}/*{APPLI}/CatalogResources.xml
  *  - else look for default:
- *    ${KERNEL_ROOT_DIR}/share/salome/resources/CatalogResources.xml
+ *    ${KERNEL_ROOT_DIR}/share/salome/resources/kernel/CatalogResources.xml
  *  - parse XML resource file.
  */ 
 //=============================================================================
@@ -87,7 +87,7 @@ SALOME_ResourcesManager::SALOME_ResourcesManager(CORBA::ORB_ptr orb)
   else
     {
       _path_resources = getenv("KERNEL_ROOT_DIR");
-      _path_resources += "/share/salome/resources/CatalogResources.xml";
+      _path_resources += "/share/salome/resources/kernel/CatalogResources.xml";
     }
 
   ParseXmlFile();

diff --git a/src/SALOMEDS/Test/SALOMEDSTest.cxx b/src/SALOMEDS/Test/SALOMEDSTest.cxx
index 6221e9b83be82e411153acbb2f976b88e1473134..88443291b8860a17d17fa96ba769260d48a277a6 100644 (file)
--- a/src/SALOMEDS/Test/SALOMEDSTest.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest.cxx
@@ -58,7 +58,7 @@ using namespace std;
 void SALOMEDSTest::setUp()
 {
   TCollection_AsciiString kernel(getenv("KERNEL_ROOT_DIR"));
-  TCollection_AsciiString subPath("/share/salome/resources");
+  TCollection_AsciiString subPath("/share/salome/resources/kernel");
   TCollection_AsciiString csf_var = (kernel+subPath);
   setenv("CSF_PluginDefaults", csf_var.ToCString(), 0);
   setenv("CSF_SALOMEDS_ResourcesDefaults", csf_var.ToCString(), 0);

diff --git a/src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx b/src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx
index de90a0a9efcb135eb2a7a64ad64613e4ecff92bd..30029799dc362b0a8f5814428bd12f1b50bce337 100644 (file)
--- a/src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx
+++ b/src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx
@@ -46,7 +46,7 @@ using namespace std;
 void SALOMEDSImplTest::setUp()
 {
   TCollection_AsciiString kernel(getenv("KERNEL_ROOT_DIR"));
-  TCollection_AsciiString subPath("/share/salome/resources");
+  TCollection_AsciiString subPath("/share/salome/resources/kernel");
   TCollection_AsciiString csf_var = (kernel+subPath);
   setenv("CSF_PluginDefaults", csf_var.ToCString(), 0);
   setenv("CSF_SALOMEDS_ResourcesDefaults", csf_var.ToCString(), 0);