Merge from V6_main 13/12/2012

diff --git a/src/HELLO/HELLO.cxx b/src/HELLO/HELLO.cxx
index e135222b06f78e9924b1b53f2df81ae662d8ffde..42de33e49439646573fe9d2d3478239d4674bbff 100755 (executable)
--- a/src/HELLO/HELLO.cxx
+++ b/src/HELLO/HELLO.cxx
@@ -21,6 +21,7 @@
 //
 
 #include "HELLO.hxx"
+#include "HELLO_version.h"
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOMEDS)
@@ -248,6 +249,16 @@ void HELLO::copyOrMove( const HELLO_ORB::object_list& what,
   }
 }
 
+// Version information
+char* HELLO::getVersion()
+{
+#if HELLO_DEVELOPMENT
+  return CORBA::string_dup(HELLO_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(HELLO_VERSION_STR);
+#endif
+}
+
 extern "C"
 {
   /*!

diff --git a/src/HELLO/HELLO.hxx b/src/HELLO/HELLO.hxx
index 01d892c9082351d79bf10a17929154955a1c168e..25d869f58f74eb3adb3bff3359d3ee776f78d2d2 100644 (file)
--- a/src/HELLO/HELLO.hxx
+++ b/src/HELLO/HELLO.hxx
@@ -44,6 +44,7 @@ public:
   void              copyOrMove( const HELLO_ORB::object_list& what,
                                SALOMEDS::SObject_ptr where,
                                CORBA::Long row, CORBA::Boolean isCopy );
+  virtual char*     getVersion();
 };
 
 extern "C"

diff --git a/src/HELLO/Makefile.am b/src/HELLO/Makefile.am
index 5a93b3b95c567d284d8ac2920eee64f3d5a3458d..5e96bf35bedaa4e918e398e11d35f8159b778096 100755 (executable)
--- a/src/HELLO/Makefile.am
+++ b/src/HELLO/Makefile.am
@@ -36,7 +36,8 @@ libHELLOEngine_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libHELLOEngine_la_LDFLAGS = \
        ../../idl/libSalomeIDLHELLO.la \