Fix for the "0052220: TC7.3.0:Unknown version of HexaBlock" issue.

diff --git a/HEXABLOCK_version.h.in b/HEXABLOCK_version.h.in
index b2dc846e854b4f71ef12c0f0db249423d98840e7..d448bd61784f18517e84d1a2d16be3d3aa299da7 100755 (executable)
--- a/HEXABLOCK_version.h.in
+++ b/HEXABLOCK_version.h.in
@@ -24,8 +24,23 @@
   HEXABLOCK_VERSION is (major << 16) + (minor << 8) + patch.
 */
 
-#define HEXABLOCK_VERSION_STR "@VERSION@"
-#define HEXABLOCK_VERSION     @XVERSION@
-#define HEXABLOCK_DEVELOPMENT @VERSION_DEV@
+
+/*!
+  Specify version of SALOME HEXABLOCK module, as follows
+
+HEXABLOCK_VERSION_MAJOR       : (integer) number identifying major version
+HEXABLOCK_VERSION_MINOR       : (integer) number identifying minor version
+HEXABLOCK_VERSION_MAINTENANCE : (integer) number identifying maintenance version
+HEXABLOCK_VERSION_STR         : (string)  complete version number "major.minor.maintenance"
+HEXABLOCK_VERSION             : (hex)     complete version number (major << 16) + (minor << 8) + maintenance
+HEXABLOCK_DEVELOPMENT         : (integer) indicates development version when set to 1
+ */
+
+#define HEXABLOCK_VERSION_MAJOR       @SALOMEHEXABLOCK_MAJOR_VERSION@
+#define HEXABLOCK_VERSION_MINOR       @SALOMEHEXABLOCK_MINOR_VERSION@
+#define HEXABLOCK_VERSION_MAINTENANCE @SALOMEHEXABLOCK_PATCH_VERSION@
+#define HEXABLOCK_VERSION_STR         "@SALOMEHEXABLOCK_VERSION@"
+#define HEXABLOCK_VERSION             @SALOMEHEXABLOCK_XVERSION@
+#define HEXABLOCK_DEVELOPMENT         @SALOMEHEXABLOCK_VERSION_DEV@
 
 #endif // __HEXABLOCK_VERSION_H__

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
index 4acadca255b45d673a82cfa78fdcce1c31060553..a928adba0ff692978d1db2f5678783f89f95f4aa 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
@@ -98,7 +98,7 @@
 #include "HEXABLOCKGUI_OccGraphicView.hxx"
 #include "HEXABLOCKGUI_GraphicViewsHandler.hxx"
 
-#include <HEXABLOCK_version.h>
+#include "HEXABLOCK_version.h"
 
 #include "MyBasicGUI_PointDlg.hxx"
 

diff --git a/src/HEXABLOCKGUI/resources/SalomeApp.xml.in b/src/HEXABLOCKGUI/resources/SalomeApp.xml.in
index a003c8e690404ed180bc4a36bf3e85a22b54c2b4..16ab98d943d36ed73bcc2980770df59e1a397081 100755 (executable)
--- a/src/HEXABLOCKGUI/resources/SalomeApp.xml.in
+++ b/src/HEXABLOCKGUI/resources/SalomeApp.xml.in
@@ -24,15 +24,15 @@
     <!-- Major module parameters -->
     <parameter name="name"          value="HexaBlock"/>
     <parameter name="icon"          value="ModuleHexablock.png"/>
-    <parameter name="version"       value="@VERSION@"/>        
+    <parameter name="version"       value="@SALOMEHEXABLOCK_VERSION@"/>        
     <parameter name="documentation" value="hexablock_help"/>
   </section>
   <section name="hexablock_help" >
     <parameter name="sub_menu"          value="%1 module"/>
-    <parameter name="User's Guide"      value="${HEXABLOCK_ROOT_DIR}/share/doc/salome/gui/HEXABLOCK/index.html"/>
+    <parameter name="User's Guide"      value="%HEXABLOCK_ROOT_DIR%/share/doc/salome/gui/HEXABLOCK/index.html"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="HEXABLOCK" value="${HEXABLOCK_ROOT_DIR}/share/salome/resources/hexablock"/>
+    <parameter name="HEXABLOCK" value="%HEXABLOCK_ROOT_DIR%/share/salome/resources/hexablock"/>
   </section>
 </document>