Merge from V6_main 13/12/2012

diff --git a/src/AddComponent/AddComponent_Impl.cxx b/src/AddComponent/AddComponent_Impl.cxx
index ce61ff50fba7b3c11682a33793703e86ed954077..e28904133886794ea34989813f8a2572410e9514 100644 (file)
--- a/src/AddComponent/AddComponent_Impl.cxx
+++ b/src/AddComponent/AddComponent_Impl.cxx
@@ -39,6 +39,7 @@
 
 #include "AddComponent_Impl.hxx"
 #include "Adder_Impl.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -63,6 +64,15 @@ AddComponent_Impl::AddComponent_Impl() {
 AddComponent_Impl::~AddComponent_Impl() {
 }
 
+char* AddComponent_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 CORBA::Double AddComponent_Impl::Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) {
   beginService( " AddComponent_Impl::Add" );
   z = x + y ;

diff --git a/src/AddComponent/AddComponent_Impl.hxx b/src/AddComponent/AddComponent_Impl.hxx
index ea0baa9cf582e641190aef4c28bcb86480eebb9b..517a8f331c1eed138bec155ab7a2acd3efaf8e46 100644 (file)
--- a/src/AddComponent/AddComponent_Impl.hxx
+++ b/src/AddComponent/AddComponent_Impl.hxx
@@ -47,6 +47,8 @@ public:
 
   virtual ~AddComponent_Impl();
 
+  virtual char* getVersion();
+
   virtual CORBA::Double Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) ;
   virtual CORBA::Double AddWithoutSleep( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) ;
 

diff --git a/src/AddComponent/Adder_Impl.cxx b/src/AddComponent/Adder_Impl.cxx
index 84dbc86835d2b4a2d09ba8886261b19d3ae8b6bc..5d53e0432372786c6fa8fe1175339cf01969106e 100644 (file)
--- a/src/AddComponent/Adder_Impl.cxx
+++ b/src/AddComponent/Adder_Impl.cxx
@@ -38,6 +38,7 @@
 #include "SALOME_LifeCycleCORBA.hxx"
 
 #include "Adder_Impl.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -70,6 +71,15 @@ Adder_Impl::~Adder_Impl() {
   endService( "Adder_Impl::~Adder_Impl" );
 }
 
+char* Adder_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void Adder_Impl::destroy() {
   _poa->deactivate_object(*_id) ;
   CORBA::release(_poa) ;

diff --git a/src/AddComponent/Adder_Impl.hxx b/src/AddComponent/Adder_Impl.hxx
index ffc4e6c2c893e2294b4fbde3fea17d7f50ef3aed..845083871787750661afa132403c8aeb20b5bc48 100644 (file)
--- a/src/AddComponent/Adder_Impl.hxx
+++ b/src/AddComponent/Adder_Impl.hxx
@@ -49,6 +49,8 @@ class Adder_Impl :  public POA_SuperVisionTest::Adder ,
 
     virtual ~Adder_Impl();
 
+    virtual char* getVersion();
+
     virtual void destroy() ;
 
     virtual CORBA::Double Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) ;

diff --git a/src/AddComponent/Makefile.am b/src/AddComponent/Makefile.am
index 7e400934426a19c3779dab38e86bb101e923862a..f1518c8205a25a1e801a44f19966e644c57bfc75 100755 (executable)
--- a/src/AddComponent/Makefile.am
+++ b/src/AddComponent/Makefile.am
@@ -49,7 +49,9 @@ libAddComponentEngine_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
+
 libAddComponentEngine_la_LDFLAGS = \
        ../../idl/libSalomeIDLCOMPONENT.la \
        $(KERNEL_LDFLAGS) \

diff --git a/src/AdditionComponent/AdditionComponent_Impl.cxx b/src/AdditionComponent/AdditionComponent_Impl.cxx
index b4f218483ef684ff90e073d4773f6d9db3bf142a..23096d596c51dc55c97bc474de42081336f013ac 100644 (file)
--- a/src/AdditionComponent/AdditionComponent_Impl.cxx
+++ b/src/AdditionComponent/AdditionComponent_Impl.cxx
@@ -39,6 +39,7 @@
 
 #include "AdditionComponent_Impl.hxx"
 #include "Adder_Impl.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -63,6 +64,15 @@ AdditionInterface_Impl::AdditionInterface_Impl() {
 AdditionInterface_Impl::~AdditionInterface_Impl() {
 }
 
+char* AdditionInterface_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 CORBA::Double AdditionInterface_Impl::Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) {
   beginService( " AdditionInterface_Impl::Add" );
   z = x + y ;

diff --git a/src/AdditionComponent/AdditionComponent_Impl.hxx b/src/AdditionComponent/AdditionComponent_Impl.hxx
index a59e92d771b8545c6547de262adb95735dc5c3a3..69791d1ea97ba8956bb971e2cb680338d7aafc3d 100644 (file)
--- a/src/AdditionComponent/AdditionComponent_Impl.hxx
+++ b/src/AdditionComponent/AdditionComponent_Impl.hxx
@@ -47,6 +47,8 @@ public:
 
   virtual ~AdditionInterface_Impl();
 
+  virtual char* getVersion();
+
   virtual CORBA::Double Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) ;
   virtual CORBA::Double AddWithoutSleep( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) ;
 

diff --git a/src/AdditionComponent/Addition_Adder_Impl.cxx b/src/AdditionComponent/Addition_Adder_Impl.cxx
index 052ab4850ecc1580ef59f30474ec75c84819262f..4c89ede85786ed8a1652f9fcc96204fa4cb58d08 100644 (file)
--- a/src/AdditionComponent/Addition_Adder_Impl.cxx
+++ b/src/AdditionComponent/Addition_Adder_Impl.cxx
@@ -38,6 +38,7 @@
 #include "SALOME_LifeCycleCORBA.hxx"
 
 #include "Addition_Adder_Impl.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -65,6 +66,15 @@ Adder_Impl::Adder_Impl() {
   LastAddition = 0 ;
 }
 
+char* Adder_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 Adder_Impl::~Adder_Impl() {
   beginService( "Adder_Impl::~Adder_Impl" );
   endService( "Adder_Impl::~Adder_Impl" );

diff --git a/src/AdditionComponent/Addition_Adder_Impl.hxx b/src/AdditionComponent/Addition_Adder_Impl.hxx
index 87e0c51e9e1551cef19aef2696a530f05f1be6bc..78ec32fdf3e5a39f3d115994ac26e9f7d6043acd 100644 (file)
--- a/src/AdditionComponent/Addition_Adder_Impl.hxx
+++ b/src/AdditionComponent/Addition_Adder_Impl.hxx
@@ -49,6 +49,8 @@ class Adder_Impl :  public POA_AdditionComponent::Adder ,
 
     virtual ~Adder_Impl();
 
+    virtual char* getVersion();
+
     virtual void destroy() ;
 
     virtual CORBA::Double Add( CORBA::Double x , CORBA::Double y , CORBA::Double & z ) ;

diff --git a/src/AdditionComponent/Makefile.am b/src/AdditionComponent/Makefile.am
index 28c22fde6cafa5f9774d4bda1b89d6e64bcc3ff5..94aa08c60b7db1033e5a561e44a4d82da67f0b6b 100755 (executable)
--- a/src/AdditionComponent/Makefile.am
+++ b/src/AdditionComponent/Makefile.am
@@ -49,7 +49,8 @@ libAdditionComponentEngine_la_CPPFLAGS = \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        -I$(srcdir)/../AddComponent \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libAdditionComponentEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \

diff --git a/src/CalculatorComponent/CalculatorEngine.cxx b/src/CalculatorComponent/CalculatorEngine.cxx
index c472ca8a5769e4cb5a88064ebf003d49c060a40b..44ffd9fc1c1cdeb4e4d0e74756b8ba7ba1a97a00 100644 (file)
--- a/src/CalculatorComponent/CalculatorEngine.cxx
+++ b/src/CalculatorComponent/CalculatorEngine.cxx
@@ -30,6 +30,7 @@
 #include <iostream>
 #include <sstream>
 
+#include "COMPONENT_version.h"
 #include "CalculatorEngine.hxx"
 #include "MEDMEM_Support_i.hxx"
 #include "SUPPORTClient.hxx"
@@ -108,6 +109,15 @@ CalculatorEngine::~CalculatorEngine()
   delete _NS;
 }
 
+char* CalculatorEngine::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 static omni_mutex aPutToStudyMutex;
 SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::PutToStudy(SALOME_MED::FIELDDOUBLE_ptr theField1,
                                                         CORBA::Long theStudyId) {

diff --git a/src/CalculatorComponent/CalculatorEngine.hxx b/src/CalculatorComponent/CalculatorEngine.hxx
index 1ce4f1ecd3eeaad24aa67b24d702c3195ab45e27..d1b1792b7f6216d0115ea2a6bb563ea7913e7a37 100644 (file)
--- a/src/CalculatorComponent/CalculatorEngine.hxx
+++ b/src/CalculatorComponent/CalculatorEngine.hxx
@@ -55,6 +55,7 @@ public:
 
   virtual ~CalculatorEngine();
 
+  virtual char* getVersion();
 
   SALOME_MED::FIELDDOUBLE_ptr PutToStudy(SALOME_MED::FIELDDOUBLE_ptr theField,
                                         CORBA::Long theStudyId);

diff --git a/src/CalculatorComponent/Makefile.am b/src/CalculatorComponent/Makefile.am
index 093cf13ea9f18eac46939582be527ff1d9408168..3e162c83aa68104d66881ca5e4de5910fca57d40 100755 (executable)
--- a/src/CalculatorComponent/Makefile.am
+++ b/src/CalculatorComponent/Makefile.am
@@ -41,7 +41,8 @@ libCalculatorEngine_la_CPPFLAGS = \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        $(MED_CXXFLAGS) \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libCalculatorEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \

diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.cxx b/src/DataStreamComponent/DataStreamComponent_Impl.cxx
index 2c08ea450c3aee04c31ea4d2823873606b8f244e..412fabbecea5807fde5eddd6b58807fa5e40344d 100644 (file)
--- a/src/DataStreamComponent/DataStreamComponent_Impl.cxx
+++ b/src/DataStreamComponent/DataStreamComponent_Impl.cxx
@@ -31,6 +31,7 @@
 #include <sstream>
 #include <string>
 
+#include "COMPONENT_version.h"
 #include "DataStreamComponent_Impl.hxx"
 
 using namespace std;
@@ -54,6 +55,15 @@ DataStreamFactory_Impl::DataStreamFactory_Impl() {
 DataStreamFactory_Impl::~DataStreamFactory_Impl() {
 }
 
+char* DataStreamFactory_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void DataStreamFactory_Impl::Setxy( CORBA::Long x , CORBA::Long y ) {
   _x = x ;
   _y = y ;
@@ -136,6 +146,15 @@ DataStream_Impl::~DataStream_Impl() {
   endService( "DataStream_Impl::~DataStream_Impl" );
 }
 
+char* DataStream_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void DataStream_Impl::StreamSetxy( CORBA::Long x , CORBA::Long y ) {
   _x = x ;
   _y = y ;

diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.hxx b/src/DataStreamComponent/DataStreamComponent_Impl.hxx
index 44c3ba81d1bbfa9267a325a20589416cee3405da..e1f5341d3baae5040b5447f6c15b4fcfee0a1a31 100644 (file)
--- a/src/DataStreamComponent/DataStreamComponent_Impl.hxx
+++ b/src/DataStreamComponent/DataStreamComponent_Impl.hxx
@@ -46,6 +46,8 @@ public:
 
   virtual ~DataStreamFactory_Impl();
 
+  virtual char* getVersion();
+
   virtual void Setxy( CORBA::Long x , CORBA::Long y ) ;
 
   virtual void Getxy( CORBA::Long & x , CORBA::Long & y ) ;
@@ -87,6 +89,8 @@ public:
 
   virtual ~DataStream_Impl();
 
+  virtual char* getVersion();
+
   virtual void StreamSetxy( CORBA::Long x , CORBA::Long y ) ;
 
   virtual void StreamGetxy( CORBA::Long & x , CORBA::Long & y ) ;

diff --git a/src/DataStreamComponent/Makefile.am b/src/DataStreamComponent/Makefile.am
index b7dccfba7a06e498474b935fc79a419c350e9812..95dd18389aeea96611f44436fa4f4b13ddec27d8 100644 (file)
--- a/src/DataStreamComponent/Makefile.am
+++ b/src/DataStreamComponent/Makefile.am
@@ -49,7 +49,8 @@ libDataStreamFactoryEngine_la_CPPFLAGS = \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        -I$(srcdir)/../AddComponent \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libDataStreamFactoryEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \

diff --git a/src/DivComponent/DivComponent.cxx b/src/DivComponent/DivComponent.cxx
index e4e5f706104861b74039fec6d29d654ce48080ac..c49a63f0cf244123648f49a8db5691ef995f8486 100644 (file)
--- a/src/DivComponent/DivComponent.cxx
+++ b/src/DivComponent/DivComponent.cxx
@@ -33,6 +33,7 @@
 
 //#include "utilities.h"
 #include "DivComponent.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -58,6 +59,15 @@ DivComponentEngine::~DivComponentEngine()
 {
 }
 
+char* DivComponentEngine::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void DivComponentEngine::Div( double x , double y , double & z ) {
   beginService( " DivComponentEngine::Div" );
   z = x / y ;

diff --git a/src/DivComponent/DivComponent.hxx b/src/DivComponent/DivComponent.hxx
index eb022edfb626f8493b9c6a1baf2efee273810d52..f7422a9bc28847b46bf03c25ee0435bdf8588261 100644 (file)
--- a/src/DivComponent/DivComponent.hxx
+++ b/src/DivComponent/DivComponent.hxx
@@ -47,6 +47,8 @@ public:
 
   virtual ~DivComponentEngine();
 
+  virtual char* getVersion();
+
   void Div( double x , double y , double & z ) ;
 
 private:

diff --git a/src/DivComponent/Makefile.am b/src/DivComponent/Makefile.am
index 27140e88209e2372e68c919a3b524664046e9e12..d85e889ea0de0b24c5136ad53fa7257694dd3596 100755 (executable)
--- a/src/DivComponent/Makefile.am
+++ b/src/DivComponent/Makefile.am
@@ -40,7 +40,8 @@ libDivComponentEngine_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libDivComponentEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \

diff --git a/src/FactorialComponent/FactorialComponent.py b/src/FactorialComponent/FactorialComponent.py
index c54daea7300af9b7a9b4d836eb5f3c3665c93a63..acd1c4152ddd174743adf8b258b9e0ace60fde04 100644 (file)
--- a/src/FactorialComponent/FactorialComponent.py
+++ b/src/FactorialComponent/FactorialComponent.py
@@ -71,6 +71,10 @@ class FactorialComponent( SuperVisionTest__POA.FactorialComponent, SALOME_Compon
         self.endService( 'FactorialComponent sigma' )
         return s
     
+    def getVersion( self ):
+        import salome_version
+        return salome_version.getVersion("COMPONENT", True)
+
     def __init__(self, orb, poa, this, containerName, instanceName, interfaceName):
         SALOME_ComponentPy_i.__init__(self, orb, poa, this, containerName,
                                       instanceName, interfaceName, 0)

diff --git a/src/MulComponent/Makefile.am b/src/MulComponent/Makefile.am
index 69315fdfb0c3e1052fb2a4dc121a51d5f9fa420e..d53131de92c3f3ecb40732b4bd1f8ee4c58d2358 100755 (executable)
--- a/src/MulComponent/Makefile.am
+++ b/src/MulComponent/Makefile.am
@@ -39,7 +39,8 @@ libMulComponentEngine_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libMulComponentEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \

diff --git a/src/MulComponent/MulComponent.cxx b/src/MulComponent/MulComponent.cxx
index 1f7da802e18499a0a62871973375ddb75715ca39..f7d7a85501f8c06dd7e156e376bfe6119417f240 100644 (file)
--- a/src/MulComponent/MulComponent.cxx
+++ b/src/MulComponent/MulComponent.cxx
@@ -33,6 +33,7 @@
 
 //#include "utilities.h"
 #include "MulComponent.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -58,6 +59,15 @@ MulComponentEngine::~MulComponentEngine()
 {
 }
 
+char* MulComponentEngine::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void MulComponentEngine::Mul( double x , double y , double & z ) {
   beginService( " MulComponentEngine::Mul" );
   z = x * y ;

diff --git a/src/MulComponent/MulComponent.hxx b/src/MulComponent/MulComponent.hxx
index 9ad5d9ea8f8eed22e6037311227d71b43000e043..a3c12e08df0421c50c503311fba75c87622f020b 100644 (file)
--- a/src/MulComponent/MulComponent.hxx
+++ b/src/MulComponent/MulComponent.hxx
@@ -47,6 +47,8 @@ public:
 
   virtual ~MulComponentEngine();
 
+  virtual char* getVersion();
+
   void Mul( double x , double y , double & z ) ;
 
 private:

diff --git a/src/SIGNALSComponent/Makefile.am b/src/SIGNALSComponent/Makefile.am
index 469ff54f33a714b0b23ff800d8d737b7f1118381..8fcd69dc5d626f259f16fb526b165c9e819d79a5 100755 (executable)
--- a/src/SIGNALSComponent/Makefile.am
+++ b/src/SIGNALSComponent/Makefile.am
@@ -47,7 +47,8 @@ libSIGNALSComponentEngine_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libSIGNALSComponentEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \

diff --git a/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx b/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx
index 099293e6c4a0ef4e506664cd2b054914e292d51d..1caa05a239c19bf3f81df0e966d99217d6658fe6 100755 (executable)
--- a/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx
+++ b/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx
@@ -33,6 +33,7 @@
 
 //#include "utilities.h"
 #include "SIGNALSComponent_Impl.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -60,6 +61,15 @@ SIGNALSComponent_Impl::~SIGNALSComponent_Impl()
 {
 }
 
+char* SIGNALSComponent_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 CORBA::Long SIGNALSComponent_Impl::SIGSEGVfunc() {
   beginService( " SIGNALSComponent_Impl::SIGSEGVfunc" );
   cout << pthread_self() << "SIGNALSComponent_Impl::SIGSEGVfunc" << endl ;

diff --git a/src/SIGNALSComponent/SIGNALSComponent_Impl.hxx b/src/SIGNALSComponent/SIGNALSComponent_Impl.hxx
index d7c4f9464ee9826fa5afa4b25878808e53702a56..9f31612ae0a41b704fca1ced327d7d419c1d6481 100755 (executable)
--- a/src/SIGNALSComponent/SIGNALSComponent_Impl.hxx
+++ b/src/SIGNALSComponent/SIGNALSComponent_Impl.hxx
@@ -47,6 +47,8 @@ public:
 
   virtual ~SIGNALSComponent_Impl();
 
+  virtual char* getVersion();
+
   CORBA::Long SIGSEGVfunc() ;
   CORBA::Long SIGFPEfunc( CORBA::Long a , CORBA::Long b ) ;
   void MethodToKill() ;

diff --git a/src/SubComponent/Makefile.am b/src/SubComponent/Makefile.am
index 3ed7e78723fdc3639951b607bf9a5f51cd926956..87cf3b3c9395b4c191770f849e0d591dabf0bedf 100755 (executable)
--- a/src/SubComponent/Makefile.am
+++ b/src/SubComponent/Makefile.am
@@ -40,7 +40,8 @@ libSubComponentEngine_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libSubComponentEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \

diff --git a/src/SubComponent/SubComponent.cxx b/src/SubComponent/SubComponent.cxx
index ee4114931bad97a04026d3cffff13aea94dc9f3d..7d34775de3bd6d1ec55a22a053476ef853a890db 100644 (file)
--- a/src/SubComponent/SubComponent.cxx
+++ b/src/SubComponent/SubComponent.cxx
@@ -31,7 +31,7 @@
 #include <sstream>
 #include <string>
 
-//#include "utilities.h"
+#include "COMPONENT_version.h"
 #include "SubComponent.hxx"
 
 using namespace std;
@@ -58,6 +58,15 @@ SubComponentEngine::~SubComponentEngine()
 {
 }
 
+char* SubComponentEngine::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void SubComponentEngine::Sub( double x , double y , double & z ) {
   beginService( " SubComponentEngine::Sub" );
   z = x - y ;

diff --git a/src/SubComponent/SubComponent.hxx b/src/SubComponent/SubComponent.hxx
index 8c2d7195b6ccb1c4b17e10879e9a0445a3c19b82..20513c221e2040f9b695fd8891709cbd4e78345f 100644 (file)
--- a/src/SubComponent/SubComponent.hxx
+++ b/src/SubComponent/SubComponent.hxx
@@ -29,7 +29,6 @@
 #ifndef _SUBCOMPONENTENGINE_HXX_
 #define _SUBCOMPONENTENGINE_HXX_
 
-//#include <iostream.h>
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SubComponent)
 #include CORBA_SERVER_HEADER(SALOME_Component)
@@ -47,6 +46,8 @@ public:
 
   virtual ~SubComponentEngine();
 
+  virtual char* getVersion();
+
   void Sub( double x , double y , double & z ) ;
 
 private:

diff --git a/src/SyrComponent/Makefile.am b/src/SyrComponent/Makefile.am
index 0e02d998a7524325430bbee0e9283a09dd5a6cac..09eb305a75a42300b5a98e74ed033ee9fc1e9c09 100755 (executable)
--- a/src/SyrComponent/Makefile.am
+++ b/src/SyrComponent/Makefile.am
@@ -47,7 +47,9 @@ libSyrComponentEngine_la_CPPFLAGS = \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        -I$(srcdir)/../AddComponent \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
+
 libSyrComponentEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \
        $(KERNEL_LDFLAGS) \

diff --git a/src/SyrComponent/SyrComponent_Impl.cxx b/src/SyrComponent/SyrComponent_Impl.cxx
index 12f36e4b6d2c7acde459f72fe0fcd47d551ec1e9..47461c22a795a1e2f7b8e1ba52ade911c319f9a9 100755 (executable)
--- a/src/SyrComponent/SyrComponent_Impl.cxx
+++ b/src/SyrComponent/SyrComponent_Impl.cxx
@@ -31,8 +31,7 @@
 #include <sstream>
 #include <string>
 
-//#include "utilities.h"
-
+#include "COMPONENT_version.h"
 #include "SyrComponent_Impl.hxx"
 #include "Adder_Impl.hxx"
 
@@ -60,6 +59,15 @@ SyrComponent_Impl::SyrComponent_Impl() {
 SyrComponent_Impl::~SyrComponent_Impl() {
 }
 
+char* SyrComponent_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 CORBA::Long SyrComponent_Impl::C_ISEVEN( CORBA::Long anInteger ) {
   bool RetVal ;
   beginService( " SyrComponent_Impl::C_ISEVEN" );
@@ -307,6 +315,15 @@ ListOfSyr_Impl::~ListOfSyr_Impl() {
   endService( "ListOfSyr_Impl::~ListOfSyr_Impl" );
 }
 
+char* ListOfSyr_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 SuperVisionTest::SeqOfSyr * ListOfSyr_Impl::GetSeqOfSyr() {
   SuperVisionTest::SeqOfSyr_var aSeqOfSyr = new SuperVisionTest::SeqOfSyr( _SeqOfSyr ) ;
   return ( aSeqOfSyr._retn() ) ;

diff --git a/src/SyrComponent/SyrComponent_Impl.hxx b/src/SyrComponent/SyrComponent_Impl.hxx
index 2196e537066dae48d5c0daa8b553623865d00bca..274a4fa61465ff1d46bff944bf1aa22533c9a115 100755 (executable)
--- a/src/SyrComponent/SyrComponent_Impl.hxx
+++ b/src/SyrComponent/SyrComponent_Impl.hxx
@@ -48,6 +48,8 @@ public:
 
   virtual ~SyrComponent_Impl();
 
+  virtual char* getVersion();
+
   virtual CORBA::Long C_ISEVEN( CORBA::Long anInteger ) ;
 
   virtual CORBA::Long C_ISONE( CORBA::Long anOddInteger ) ;
@@ -96,6 +98,8 @@ public:
   ListOfSyr_Impl() ;
   virtual ~ListOfSyr_Impl();
 
+  virtual char* getVersion();
+
   virtual SuperVisionTest::SeqOfSyr * GetSeqOfSyr() ;
 
   virtual void SetSeqOfSyr( const SuperVisionTest::SeqOfSyr & ) ;

diff --git a/src/SyrControlComponent/SyrControlComponent.py b/src/SyrControlComponent/SyrControlComponent.py
index c2b8362b8ee9d64e475a1fa1d94c56ee9af34e6b..9d57c7cb60c0a20a9add4aa8c45da60d3fd0a03d 100644 (file)
--- a/src/SyrControlComponent/SyrControlComponent.py
+++ b/src/SyrControlComponent/SyrControlComponent.py
@@ -141,3 +141,7 @@ class SyrControlComponent( SuperVisionTest__POA.SyrControlComponent, SALOME_Comp
         self.Syr = lcc.FindOrLoadComponent( 'FactoryServer' , 'SyrComponent' )
         print "SyrControlComponent::__init__",dir(self.Syr)
 
+    def getVersion( self ):
+        import salome_version
+        return salome_version.getVersion("COMPONENT", True)
+

diff --git a/src/TypesCheck/Makefile.am b/src/TypesCheck/Makefile.am
index a0524be7a787eade01a86e3a028e8f76798c1e1c..f05d161a87cca301bbede74225c4012841942ada 100755 (executable)
--- a/src/TypesCheck/Makefile.am
+++ b/src/TypesCheck/Makefile.am
@@ -46,7 +46,9 @@ libTypesCheckEngine_la_CPPFLAGS = \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        -I$(srcdir)/../AddComponent \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
+
 libTypesCheckEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \
        $(KERNEL_LDFLAGS) \

diff --git a/src/TypesCheck/TypesCheck_Impl.cxx b/src/TypesCheck/TypesCheck_Impl.cxx
index daf7394c5f2249cac0d422c13322f8279fd72512..68c068cb4316550c9895678a2ebc388a153ff837 100644 (file)
--- a/src/TypesCheck/TypesCheck_Impl.cxx
+++ b/src/TypesCheck/TypesCheck_Impl.cxx
@@ -32,6 +32,7 @@
 #include <string>
 
 #include "TypesCheck_Impl.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -61,6 +62,15 @@ TypesCheck_Impl::~TypesCheck_Impl() {
   endService( "TypesCheck_Impl::~TypesCheck_Impl" );
 }
 
+char* TypesCheck_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 void TypesCheck_Impl::StringCheck( const char * InString , _CORBA_String_out OutString ) {
   beginService( "TypesCheck_Impl::StringCheck" );
   OutString = CORBA::string_dup( InString ) ;

diff --git a/src/TypesCheck/TypesCheck_Impl.hxx b/src/TypesCheck/TypesCheck_Impl.hxx
index 7fc11fca6bea01de4032e3e153d5fcabc9cef03e..c18a202c5f801dbcaa60d6f2d1603d3e709f4a23 100644 (file)
--- a/src/TypesCheck/TypesCheck_Impl.hxx
+++ b/src/TypesCheck/TypesCheck_Impl.hxx
@@ -50,6 +50,8 @@ class TypesCheck_Impl : public POA_SuperVisionTest::TypesCheck ,
 
     virtual ~TypesCheck_Impl();
 
+    virtual char* getVersion();
+
     virtual void StringCheck( const char * InString , _CORBA_String_out OutString ) ;
 
     virtual void BoolCheck( CORBA::Boolean InBool , CORBA::Boolean & OutBool ) ;

diff --git a/src/UndefinedSymbolComponent/Makefile.am b/src/UndefinedSymbolComponent/Makefile.am
index 13022295174ce531f6bafde55f8b2dc8e415a9c7..4fff18c6b56ff37436def20ed6168d2635c5d6f2 100755 (executable)
--- a/src/UndefinedSymbolComponent/Makefile.am
+++ b/src/UndefinedSymbolComponent/Makefile.am
@@ -40,7 +40,8 @@ libUndefinedSymbolComponentEngine_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libUndefinedSymbolComponentEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLCOMPONENT.la \

diff --git a/src/UndefinedSymbolComponent/UndefinedSymbolComponent.cxx b/src/UndefinedSymbolComponent/UndefinedSymbolComponent.cxx
index 6a285808c96a000030fd5365a325822e159b2c7f..99f96c690a89bfc773c41e4b78e702ce9cb92101 100755 (executable)
--- a/src/UndefinedSymbolComponent/UndefinedSymbolComponent.cxx
+++ b/src/UndefinedSymbolComponent/UndefinedSymbolComponent.cxx
@@ -33,6 +33,7 @@
 
 //#include "utilities.h"
 #include "UndefinedSymbolComponent.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -58,6 +59,15 @@ UndefinedSymbolComponentEngine::~UndefinedSymbolComponentEngine()
 {
 }
 
+char* UndefinedSymbolComponentEngine::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 extern "C" { long CallUndefined() ; } ;
 
 CORBA::Long UndefinedSymbolComponentEngine::UndefinedSymbol() {

diff --git a/src/UndefinedSymbolComponent/UndefinedSymbolComponent.hxx b/src/UndefinedSymbolComponent/UndefinedSymbolComponent.hxx
index 2717dc5f0010e431f723eee6262ecd46b24e63b9..9e61bac11756360f5dc3366fd5be9bc45d0aa854 100755 (executable)
--- a/src/UndefinedSymbolComponent/UndefinedSymbolComponent.hxx
+++ b/src/UndefinedSymbolComponent/UndefinedSymbolComponent.hxx
@@ -47,6 +47,8 @@ public:
 
   virtual ~UndefinedSymbolComponentEngine();
 
+  virtual char* getVersion();
+
   CORBA::Long UndefinedSymbol() ;
 
 private: