Merge from V7_3_BR branch 18/12/2013

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fe7bf22b2ef17bcb11202bbb80781b9abe2d837..0b895ae54636088685b8300e008a672d34fa20dc 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -171,7 +171,7 @@ SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME
 SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation")
 
 # Specific to HEXABLOCKPLUGIN:
-SET(SALOME_HEXABLOCKPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/HEXABLOCKplugin" CACHE PATH 
+SET(SALOME_HEXABLOCKPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/hexablockplugin" CACHE PATH 
     "Install path: SALOME HEXABLOCKPLUGIN specific data")
 
 MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS)
@@ -208,7 +208,7 @@ INCLUDE(CMakePackageConfigHelpers)
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
 SET(_${PROJECT_NAME}_exposed_targets 
-  HexaBlockEngine SalomeIDLHEXABLOCKPLUGIN
+  HexaBlockPluginEngine SalomeIDLHEXABLOCKPLUGIN
 )
 
 IF(SALOME_BUILD_GUI)

diff --git a/SalomeHEXABLOCKPLUGINConfig.cmake.in b/SalomeHEXABLOCKPLUGINConfig.cmake.in
index 0bd9b7bf392eaa156e9e6be231f5b2b493ab6e28..fb22406269ec049ee45bc5a1a67e832fc8ae3b6a 100644 (file)
--- a/SalomeHEXABLOCKPLUGINConfig.cmake.in
+++ b/SalomeHEXABLOCKPLUGINConfig.cmake.in
@@ -34,7 +34,7 @@
 # Load the dependencies for the libraries of @PROJECT_NAME@ 
 # (contains definitions for IMPORTED targets). This is only 
 # imported if we are not built as a subproject (in this case targets are already there)
-IF(NOT TARGET HexaBlockEngine AND NOT @PROJECT_NAME@_BINARY_DIR)
+IF(NOT TARGET HexaBlockPluginEngine AND NOT @PROJECT_NAME@_BINARY_DIR)
   INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake")
 ENDIF() 
 
@@ -115,11 +115,11 @@ IF(NOT (TARGET SMESHEngine))
 ENDIF()
 
 # Include HEXABLOCK targets if they were not already loaded:
-IF(NOT (TARGET HEXABLOCKEngine))
+IF(NOT (TARGET HexaBlockPluginEngine))
   INCLUDE("${HEXABLOCK_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeHEXABLOCKTargets.cmake")
 ENDIF()
 
 # Exposed HEXABLOCKPLUGIN targets:
-SET(HEXABLOCKPLUGIN_HexaBlockEngine HexaBlockEngine)
+SET(HEXABLOCKPLUGIN_HexaBlockPluginEngine HexaBlockPluginEngine)
 SET(HEXABLOCKPLUGIN_HEXABLOCKPluginGUI HEXABLOCKPluginGUI)
 SET(HEXABLOCKPLUGIN_SalomeIDLHEXABLOCKPLUGIN SalomeIDLHEXABLOCKPLUGIN)
\ No newline at end of file

diff --git a/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 b/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4
index f53b20b66760b2defe08366a5507385be85e512f..a206930726cc50cd593bffe111e63e49ccb75686 100755 (executable)
--- a/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4
+++ b/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4
@@ -47,7 +47,7 @@ if test "x$HEXABLOCKPLUGIN_DIR" = "x" ; then
   else
 
     # search Salome binaries in PATH variable
-    AC_PATH_PROG(TEMP, libHexaBlockEngine.so)
+    AC_PATH_PROG(TEMP, libHexaBlockPluginEngine.so)
     if test "x$TEMP" != "x" ; then
       HEXABLOCKPLUGIN_DIR=`dirname $TEMP`
     fi
@@ -56,7 +56,7 @@ if test "x$HEXABLOCKPLUGIN_DIR" = "x" ; then
 
 fi
 
-if test -f ${HEXABLOCKPLUGIN_DIR}/lib/salome/libHexaBlockEngine.so  ; then
+if test -f ${HEXABLOCKPLUGIN_DIR}/lib/salome/libHexaBlockPluginEngine.so  ; then
   HEXABLOCKPLUGIN_ok=yes
   AC_MSG_RESULT(Using HEXABLOCKPLUGIN module distribution in ${HEXABLOCKPLUGIN_DIR})
 

diff --git a/resources/HEXABLOCKPlugin.xml b/resources/HEXABLOCKPlugin.xml
index 589ee2c30c132594a0d72f789f01d20676ed5adb..3215ef81a632bfa7f4e726218b96ec438e46491b 100755 (executable)
--- a/resources/HEXABLOCKPlugin.xml
+++ b/resources/HEXABLOCKPlugin.xml
@@ -28,7 +28,7 @@
 <meshers-group name="HEXABLOCK"
                resources="HEXABLOCKPlugin"
                idl-module="HEXABLOCKPlugin"
-               server-lib="HEXABLOCKEngine"
+               server-lib="HexaBlockPluginEngine"
                gui-lib="HEXABLOCKPluginGUI">
 
   <hypotheses>

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 7548e8cc7edb5e125386516398f644f8cf99cc70..f701fccac1b0121dc20c72b9d02d84f50e042180 100755 (executable)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -20,10 +20,13 @@
 -->
 <document>
   <section name="resources">
-    <parameter name="HEXABLOCKPlugin" value="${HEXABLOCKPLUGIN_ROOT_DIR}/share/salome/resources/HEXABLOCKplugin"/>
+    <parameter name="HEXABLOCKPlugin" value="${HEXABLOCKPLUGIN_ROOT_DIR}/share/salome/resources/hexablockplugin"/>
   </section>
   <section name="SMESH">
     <!-- Default SMESH module plugins -->
     <parameter name="plugins" value="HEXABLOCKPlugin"/>
   </section>
+  <section name="smesh_help">
+    <parameter name="Plug-ins/HEXABLOCK plugin User's Guide" value="${HEXABLOCKPLUGIN_ROOT_DIR}/share/doc/salome/gui/HEXABLOCKPLUGIN/index.html"/>
+  </section>
 </document>

diff --git a/src/HEXABLOCKPlugin/CMakeLists.txt b/src/HEXABLOCKPlugin/CMakeLists.txt
index 5cf8ed2ad13ca67a269eae34579167b143d8a02d..e024024dfe65815b15bcf7ce6f45cc5408f17b3b 100644 (file)
--- a/src/HEXABLOCKPlugin/CMakeLists.txt
+++ b/src/HEXABLOCKPlugin/CMakeLists.txt
@@ -60,7 +60,7 @@ SET(_link_LIBRARIES
 # --- headers ---
 
 # header files
-SET(HexaBlockEngine_HEADERS
+SET(HexaBlockPluginEngine_HEADERS
   HEXABLOCKPlugin_Defs.hxx
   HEXABLOCKPlugin_HEXABLOCK.hxx
   HEXABLOCKPlugin_HEXABLOCK_i.hxx
@@ -73,7 +73,7 @@ SET(HexaBlockEngine_HEADERS
 # --- sources ---
 
 # sources / static
-SET(HexaBlockEngine_SOURCES
+SET(HexaBlockPluginEngine_SOURCES
   HEXABLOCKPlugin_HEXABLOCK.cxx
   HEXABLOCKPlugin_HEXABLOCK_i.cxx
   HEXABLOCKPlugin_i.cxx
@@ -85,8 +85,8 @@ SET(HexaBlockEngine_SOURCES
 
 # --- rules ---
 
-ADD_LIBRARY(HexaBlockEngine ${HexaBlockEngine_SOURCES})
-TARGET_LINK_LIBRARIES(HexaBlockEngine ${_link_LIBRARIES} )
-INSTALL(TARGETS HexaBlockEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+ADD_LIBRARY(HexaBlockPluginEngine ${HexaBlockPluginEngine_SOURCES})
+TARGET_LINK_LIBRARIES(HexaBlockPluginEngine ${_link_LIBRARIES} )
+INSTALL(TARGETS HexaBlockPluginEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-INSTALL(FILES ${HexaBlockEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+INSTALL(FILES ${HexaBlockPluginEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
index ed0a8a4ca53300aac32e9a522b49b5dcbd4509af..19f862764424a099299149d4869d9fb2398ab578 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
@@ -25,7 +25,7 @@
 #define _HEXABLOCKPlugin_DEFS_HXX_
 
 #ifdef WIN32
-  #if defined HEXABLOCKENGINE_EXPORTS || defined HexaBlockEngine_EXPORTS
+  #if defined HEXABLOCKENGINE_EXPORTS || defined HexaBlockPluginEngine_EXPORTS
     #define HEXABLOCKPLUGINENGINE_EXPORT __declspec( dllexport )
   #else
     #define HEXABLOCKPLUGINENGINE_EXPORT __declspec( dllimport )