...

[cpPlugins.git] / appli / bash / cpPlugins_createHost.cxx

diff --git a/appli/bash/cpPlugins_createHost.cxx b/appli/bash/cpPlugins_createHost.cxx
index 4f46211900df09edbd6c78ff9c12555582947db0..d75292774d2501b52a0f5511355201f1ca7a98c1 100644 (file)
--- a/appli/bash/cpPlugins_createHost.cxx
+++ b/appli/bash/cpPlugins_createHost.cxx
@@ -1,6 +1,7 @@
 #include <cstring>
 #include <fstream>
 #include <iostream>
+#include <sstream>
 #include <string>
 
 // -------------------------------------------------------------------------
@@ -25,7 +26,7 @@ std::string GetFileName( const std::string& path )
   std::size_t pos = fname.find_last_of( "." );
   if( pos != std::string::npos )
     fname = fname.substr( 0, pos );
-  
+
   return( fname );
 }
 
@@ -53,18 +54,46 @@ int main( int argc, char* argv[] )
   } // fi
 
   output_code << "#include <Pluma/Connector.hpp>" << std::endl;
+  output_code
+    << "#include <cpPlugins/Interface/ProcessObjectProvider.h>"
+    << std::endl;
+  for( int i = 3; i < argc; ++i )
+    output_code << "#include \"" << argv[ i ] << "\"" << std::endl;
+  output_code << std::endl;
+
+  std::istringstream nspaces( argv[ 2 ] );
+  std::string nspace;
+  unsigned int number_of_nspaces = 0;
+  while( std::getline( nspaces, nspace, ':' ) )
+  {
+    if( nspace != "" )
+    {
+      output_code << "namespace " << nspace << std::endl << "{" << std::endl;
+      number_of_nspaces++;
+
+    } // fi
+
+  } // elihw
+
   for( int i = 3; i < argc; ++i )
-    output_code << "#include <" << argv[ i ] << ">" << std::endl;
+    output_code
+      << "CPPLUGINS_INHERIT_PROVIDER( "
+      << GetFileName( argv[ i ] ) << " );" << std::endl;
+
+  for( unsigned int i = 0; i < number_of_nspaces; ++i )
+    output_code << "}" << std::endl;
+  output_code << std::endl;
+
+
   output_code
-    << std::endl
     << "PLUMA_CONNECTOR" << std::endl
     << "bool connect( pluma::Host& host )" << std::endl
-    << "{" << std::endl
-    << "  using namespace " << argv[ 2 ] << ";" << std::endl;
+    << "{" << std::endl;
 
   for( int i = 3; i < argc; ++i )
     output_code
       << "  host.add( new "
+      << argv[ 2 ] << "::"
       << GetFileName( argv[ i ] )
       << "Provider( ) );"
       << std::endl;
@@ -73,6 +102,8 @@ int main( int argc, char* argv[] )
     << "  return( true );" << std::endl
     << "}" << std::endl;
 
+  output_code << std::endl << "// eof - $RCSfile$" << std::endl << std::endl;
+
   // Finish
   output_code.close( );
   return( 0 );