ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-18 12:40:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix to bug PAL10465.

Browse Source 
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.
This commit is contained in:
asv 2006-06-27 07:42:15 +00:00
parent 8e12e2d082
commit 6001bdbaa6
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm_local/unix/make_commence.in
View File

@ -1,6 +1,8 @@
# common directories to put headerfiles # common directories to put headerfiles
inc_builddir=$(top_builddir)/include/salome inc_builddir=$(top_builddir)/include/salome
MODULE_NAME=@MODULE_NAME@
@SET_MAKE@ @SET_MAKE@
SHELL=/bin/sh SHELL=/bin/sh

6
configure.in.base
View File

@ -28,6 +28,10 @@ XVERSION=0x030200
AC_SUBST(VERSION) AC_SUBST(VERSION)
AC_SUBST(XVERSION) AC_SUBST(XVERSION)
# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
MODULE_NAME=geom
AC_SUBST(MODULE_NAME)
dnl dnl
dnl Initialize source and build root directories dnl Initialize source and build root directories
dnl dnl
@ -325,7 +329,7 @@ else
fi fi
# make other build directories # 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 do
# if test ! -d $rep ; then # if test ! -d $rep ; then
# eval mkdir $rep # eval mkdir $rep

2
resources/SalomeApp.xml
View File

@ -6,7 +6,7 @@
</section> </section>
<section name="resources"> <section name="resources">
<!-- Module 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>
<section name="Geometry" > <section name="Geometry" >
<!-- Other module preferences --> <!-- Other module preferences -->

4
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -383,9 +383,9 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
// Initialize the Resource Manager // Initialize the Resource Manager
TCollection_AsciiString aResDir (getenv("GEOM_ROOT_DIR")); TCollection_AsciiString aResDir (getenv("GEOM_ROOT_DIR"));
#ifdef WNT #ifdef WNT
aResDir += "\\share\\salome\\resources"; aResDir += "\\share\\salome\\resources\\geom";
#else #else
aResDir += "/share/salome/resources"; aResDir += "/share/salome/resources/geom";
#endif #endif
char * dir = getenv("GEOM_ENGINE_RESOURCES_DIR"); char * dir = getenv("GEOM_ENGINE_RESOURCES_DIR");
TCollection_AsciiString aUserResDir; TCollection_AsciiString aUserResDir;