]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Fix to bug PAL10465.
authorasv <asv@opencascade.com>
Tue, 27 Jun 2006 07:42:15 +0000 (07:42 +0000)
committerasv <asv@opencascade.com>
Tue, 27 Jun 2006 07:42:15 +0000 (07:42 +0000)
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.

adm_local/unix/make_commence.in
configure.in.base
resources/SalomeApp.xml
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx

index 8805b6d6d8d51b1f4d5fd00bbe1a34138f12d0d0..8a907ac9e004198c5ac89786a30537cfb797cd4b 100644 (file)
@@ -1,6 +1,8 @@
 # common directories to put headerfiles
 inc_builddir=$(top_builddir)/include/salome
 
+MODULE_NAME=@MODULE_NAME@
+
 @SET_MAKE@
 SHELL=/bin/sh
 
index 1a444a1041d14321316c45eb4ba3777d371395c2..48ec8ad2783a64c0ec88c33a8f392cccdaebd3e3 100644 (file)
@@ -28,6 +28,10 @@ XVERSION=0x030200
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=geom
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -325,7 +329,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
index 6fa3c613db048a560c8017eaca3fca9f1d31a0a7..05512c6cc9d9c5580fdecd2dcdefeb80d80fe210 100644 (file)
@@ -6,7 +6,7 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="GEOM" value="${GEOM_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="GEOM" value="${GEOM_ROOT_DIR}/share/salome/resources/geom"/>
   </section>
   <section name="Geometry" >
     <!-- Other module preferences -->
index 54155661bac4ab7de8dcf9007c320b1c3fb2b852..8bb1c2851d030028d29d8b06444e5d2d163db0ef 100644 (file)
@@ -383,9 +383,9 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
     // Initialize the Resource Manager
     TCollection_AsciiString aResDir (getenv("GEOM_ROOT_DIR"));
 #ifdef WNT
-    aResDir += "\\share\\salome\\resources";
+    aResDir += "\\share\\salome\\resources\\geom";
 #else
-    aResDir += "/share/salome/resources";
+    aResDir += "/share/salome/resources/geom";
 #endif
     char * dir = getenv("GEOM_ENGINE_RESOURCES_DIR");
     TCollection_AsciiString aUserResDir;