X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=aef6d59ed9c84b7670377040b6388278235bf6ce;hp=ec974036bac336b9fdeba37d059cf6411bde973b;hb=2f0896ce9a4305c9538917492faf8c78fe7b9b1a;hpb=d340d435f156ae23b7d285c6e3abd59b019a5363

diff --git a/codegen/main.cpp b/codegen/main.cpp
index ec97403..aef6d59 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -6,6 +6,16 @@
 #include <list>
 #include <stdexcept>
 #include <boost/lexical_cast.hpp>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
+//! map group to class name
+std::string
+groupClass(const std::string &group) {
+    return std::string("cmd_group_")+group;
+}
 
 //! convert string to upper case
 std::string
@@ -291,7 +301,7 @@ protected:
 };
 
 void output_common_hpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs) {
-    o << "class cmd_group_" << group << " : public libt2n::command\n"
+    o << "class " << groupClass(group) << " : public libt2n::command\n"
       << "{\n"
       << "private:\n"
       << "	friend class boost::serialization::access;\n"
@@ -319,7 +329,7 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis
 	  << "};\n";
     }
     for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
-	o << "class " << it->cmd_classname() << " : public " << "cmd_group_" << group << "\n"
+	o << "class " << it->cmd_classname() << " : public " << groupClass(group) << "\n"
 	  << "{\n"
 	  << "private:\n";
 	for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
@@ -329,7 +339,7 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis
 	  << "	template<class Archive>\n"
 	  << "	void serialize(Archive & ar, const unsigned int /* version */)\n"
 	  << "	{\n"
-	  << "		ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(cmd_group_" << group << ");\n";
+	  << "		ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(" << groupClass(group) << ");\n";
 	for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
 	    o << "		ar & BOOST_SERIALIZATION_NVP(" << ait->first << ");\n";
 	}
@@ -362,7 +372,7 @@ void output_common_cpp(std::ostream &o, const std::string &group, const std::lis
        << "#include <boost/serialization/export.hpp>\n"
        << "\n"
        << "/* register types with boost serialization */\n";
-     o << "BOOST_CLASS_EXPORT(cmd_group_" << group << ")\n";
+     o << "BOOST_CLASS_EXPORT(" << groupClass(group) << ")\n";
      for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
 	  o << "BOOST_CLASS_EXPORT("<<it->ret_classname()<<")\n"
 	    << "BOOST_CLASS_EXPORT("<<it->cmd_classname()<<")\n";
@@ -372,10 +382,10 @@ void output_common_cpp(std::ostream &o, const std::string &group, const std::lis
 void output_client_hpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs) {
      o << "#include <command_client.hxx>\n";
 
-     o << "class cmd_group_" << group << "_client : public libt2n::command_client\n"
+     o << "class " << groupClass(group) << "_client : public libt2n::command_client\n"
        << "{\n"
        << "public:\n"
-       << "cmd_group_" << group << "_client(libt2n::client_connection &_c,\n"
+       << groupClass(group) << "_client(libt2n::client_connection &_c,\n"
        << "	long long _command_timeout_usec=command_timeout_usec_default,\n"
        << "	long long _hello_timeout_usec=hello_timeout_usec_default)\n"
        << "	: libt2n::command_client(_c,_command_timeout_usec,_hello_timeout_usec)\n"
@@ -395,7 +405,7 @@ void output_client_cpp(std::ostream &o, const std::string &group, const std::lis
      }
 
      for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
-	 o << pit->ret_type << " cmd_group_" << group << "_client::" << pit->name << "(" << pit->args << ")\n"
+	 o << pit->ret_type << " " << groupClass(group) << "_client::" << pit->name << "(" << pit->args << ")\n"
 	   << "{\n"
 	   << "	libt2n::result_container rc;\n"
 	   << "	send_command(new " << pit->cmd_classname() << "(";
@@ -444,7 +454,7 @@ struct header_file : public std::ofstream
      header_file(const char* fname) : std::ofstream(fname) {
 	  std::cerr << "create header: '" << fname << "'" << std::endl;
 	  std::string macro(replace(toupper(fname),'.','_'));
-	  *this << "// automatically generated code - do not edit\n" << std::endl;
+	  *this << "// automatically generated code (generated by libt2n-codegen " << VERSION << ") - do not edit\n" << std::endl;
 	  *this << "#ifndef " << macro << "\n"
 		<< "#define " << macro << "\n";
      }
@@ -464,12 +474,18 @@ struct cpp_file : public std::ofstream
 int
 main(int argc, char* argv[])
 {
-     if (argc < 3) {
-	  std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
-	  return 1;
-     }
+    // todo: maybe use getopt
+    if ((argc>1)&&(std::string(argv[1])=="--version")) {
+	std::cerr << VERSION << std::endl;
+	return 0;
+    }
+    if (argc < 3)
+    {
+	std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
+	return 1;
+    }
 
-     try{
+    try{
 	  std::string group(argv[1]);
 	  std::list<std::string> xmlfiles;
 	  for (int i=2;i<argc;++i)