X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=85c56ebee340afb096f15333c482081a8cd4fa4f;hp=e3ce124f59193993a086de802ab3c6ed5a8c9753;hb=c0a5c7713b976c7165aa213b4ceb36e15b117d61;hpb=25924caeef56c6e09e73216885912ac525ebec9f

diff --git a/codegen/main.cpp b/codegen/main.cpp
index e3ce124..85c56eb 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -496,61 +496,27 @@ struct cpp_file : public std::ofstream
      }
 };
 
-std::list<std::string>
-get_includes(const std::string &fname)
-{
-     // grep "#include" fname
-     std::ifstream in(fname.c_str());
-     std::string line;
-     std::list<std::string> ret;
-     while (std::getline(in,line)) {
-	  if (line.find("#include")!=std::string::npos)
-	       ret.push_back(line);
-     }
-     return ret;
-}
-
-void
-paste_includes(std::ostream &o, std::list<std::string> &i)
-{
-     o << std::endl
-       << "// copied includes begin" << std::endl;
-     for (std::list<std::string>::const_iterator it=i.begin(); it!=i.end(); ++it)
-	  o << *it << std::endl;
-     o << "// copied includes end" << std::endl
-       << std::endl;
-}
-
-struct RemoveGenerated
-{
-     RemoveGenerated(const std::string &_prefix) : prefix(_prefix) {}
-     bool operator()(const std::string &s) const {
-	  return (s.find(prefix+"common.hxx")!=std::string::npos);
-     }
-     const std::string &prefix;
-};
-
 int
 main(int argc, char* argv[])
 {
-     if (argc != 4) {
-	  std::cerr << "Usage: " << argv[0] << " export-file gccxml-file default-group" << std::endl;
+     if (argc < 3) {
+	  std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
 	  return 1;
      }
 
      try{
-	  std::string exportfile(argv[1]);
-	  std::string xmlfile(argv[2]);
-	  std::string group(argv[3]);
-	  std::string prefix=group+"_";
-	  std::list<std::string> includes(get_includes(exportfile));
-	  remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix));
-	  includes.erase(remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix)), includes.end());
+	  std::string group(argv[1]);
+	  std::list<std::string> xmlfiles;
+	  for (int i=2;i<argc;++i)
+	    xmlfiles.push_back(argv[i]);
 
-	  //paste_includes(std::cerr, includes);
-  
-	  Parser parser(xmlfile, group);
-	  std::list<t2n_procedure> procedures(parser.get_procedures());
+	  std::string prefix=group+"_";
+	  std::list<t2n_procedure> procedures;
+	  for (std::list<std::string>::iterator it=xmlfiles.begin();it!=xmlfiles.end();++it) {
+	    Parser parser(*it, group);
+	    const std::list<t2n_procedure> &p(parser.get_procedures());
+	    std::copy(p.begin(), p.end(), std::back_inserter(procedures));
+	  }
 
 	  std::cerr << "Procedures:" << std::endl;
 	  for (std::list<t2n_procedure>::const_iterator it=procedures.begin();it!=procedures.end();++it)
@@ -570,9 +536,9 @@ main(int argc, char* argv[])
 
 	  header_file common_hpp(common_hpp_fname.c_str());
 	  common_hpp << "// boost serialization is picky about order of include files => we have to include this one first\n"
-		     << "#include \"codegen-stubhead.hxx\"\n";
-	  paste_includes(common_hpp, includes);
-	       
+		     << "#include \"codegen-stubhead.hxx\"\n"
+		     << "#include \"" << group << ".hxx\"\n";
+
 	  output_common_hpp(common_hpp, procedures);
 
 	  cpp_file common_cpp(common_cpp_fname.c_str());
@@ -580,8 +546,8 @@ main(int argc, char* argv[])
 
 	  header_file client_hpp(client_hpp_fname.c_str());
 	  client_hpp << "// boost serialization is picky about order of include files => we have to include this one first\n"
-		     << "#include \"codegen-stubhead.hxx\"\n";
-	  paste_includes(client_hpp, includes);
+		     << "#include \"codegen-stubhead.hxx\"\n"
+		     << "#include \"" << group << ".hxx\"\n";
 	  output_client_hpp(client_hpp, procedures);
 
 	  cpp_file client_cpp(client_cpp_fname.c_str());