0021478: EDF 2083 ALL: Write the version of Salome used to create the study in the...

diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx
index 9415aa68d141f8176c5f2c7846ecac788cba3646..5bb00f44ddfc2a19e6fd596a49c8dbfea27c8107 100755 (executable)
--- a/src/HOMARD_I/HOMARD_Gen_i.cxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.cxx
@@ -17,6 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+#include "HOMARD_version.h"
 #include "HOMARD_Gen_i.hxx"
 #include "HOMARD_Cas_i.hxx"
 #include "HOMARD_Hypothesis_i.hxx"
@@ -2701,6 +2702,16 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
    return aStreamFile._retn();
 }
 
+//==========================================================================
+char* HOMARD_Gen_i::getVersion()
+{
+#if HOMARD_DEVELOPMENT
+  return CORBA::string_dup(HOMARD_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(HOMARD_VERSION_STR);
+#endif
+}
+
 //=============================================================================
 extern "C"
 {

diff --git a/src/HOMARD_I/HOMARD_Gen_i.hxx b/src/HOMARD_I/HOMARD_Gen_i.hxx
index 4f646768939bfbbb73b3b35d49e8f0d2288e3746..62ec32bf0b127aafbfc68ad4f4cf2d6cf0dc1e59 100644 (file)
--- a/src/HOMARD_I/HOMARD_Gen_i.hxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.hxx
@@ -220,11 +220,12 @@ private:
   HOMARD::HOMARD_Boundary_ptr     newBoundary();
 
 
-  virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy,
-                                       CORBA::Boolean isPublished,
-                                       CORBA::Boolean isMultiFile,
-                                       CORBA::Boolean& isValidScript);
-
+  virtual Engines::TMPFile*       DumpPython(CORBA::Object_ptr theStudy,
+                                            CORBA::Boolean isPublished,
+                                            CORBA::Boolean isMultiFile,
+                                            CORBA::Boolean& isValidScript);
+  
+  virtual char*                   getVersion();
 
 private:
   struct StudyContext

diff --git a/src/HOMARD_I/Makefile.am b/src/HOMARD_I/Makefile.am
index c71252bb027294d77aee9c7d2fff5e15d2f608fa..86c0c4b54d0471c6b623d01e7cf915a84473fe13 100644 (file)
--- a/src/HOMARD_I/Makefile.am
+++ b/src/HOMARD_I/Makefile.am
@@ -59,9 +59,10 @@ libHOMARDEngine_la_CPPFLAGS =                      \
        $(GEOM_CXXFLAGS)                      \
        -I$(srcdir)/../HOMARD                 \
        -I$(srcdir)/../HOMARDGUI              \
+       -I$(top_builddir)                     \
        -I$(top_builddir)/idl                 \
         -I$(GEOM_ROOT_DIR)/include/salome     \
-        -I$(SMESH_ROOT_DIR)/include/salome     \
+        -I$(SMESH_ROOT_DIR)/include/salome    \
         -I$(MED_ROOT_DIR)/include/salome      \
        -I$(top_builddir)/adm_local/unix