You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2006/12/01 11:57:00 UTC
svn commit: r481221 - in /incubator/qpid/trunk/qpid/gentools:
src/org/apache/qpid/gentools/ templ.cpp/
Author: gsim
Date: Fri Dec 1 02:56:58 2006
New Revision: 481221
URL: http://svn.apache.org/viewvc?view=rev&rev=481221
Log:
Revised generation of includes inline with latst build changes.
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
Modified: incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java (original)
+++ incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java Fri Dec 1 02:56:58 2006
@@ -1125,7 +1125,7 @@
while (mItr.hasNext())
{
AmqpMethod method = thisClass.methodMap.get(mItr.next());
- sb.append(indent + "#include <qpid/framing/" + thisClass.name +
+ sb.append(indent + "#include <" + thisClass.name +
Utils.firstUpper(method.name) + "Body.h>" + cr);
}
return sb.toString();
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl Fri Dec 1 02:56:58 2006
@@ -31,9 +31,9 @@
#ifndef _AMQP_ClientOperations_
#define _AMQP_ClientOperations_
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/ProtocolVersionException.h>
+#include <FieldTable.h>
+#include <ProtocolVersion.h>
+#include <ProtocolVersionException.h>
namespace qpid {
namespace framing {
@@ -62,7 +62,7 @@
}
// Include framing constant declarations
- #include <qpid/framing/AMQP_Constants.h>
+ #include <AMQP_Constants.h>
// Inner classes
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl Fri Dec 1 02:56:58 2006
@@ -28,8 +28,8 @@
#include <sstream>
-#include <qpid/framing/AMQP_ClientProxy.h>
-#include <qpid/framing/AMQFrame.h>
+#include <AMQP_ClientProxy.h>
+#include <AMQFrame.h>
%{MLIST} ${cpc_method_body_include}
namespace qpid {
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl Fri Dec 1 02:56:58 2006
@@ -29,9 +29,9 @@
#ifndef _AMQP_ClientProxy_
#define _AMQP_ClientProxy_
-#include <qpid/framing/AMQP_ClientOperations.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/OutputHandler.h>
+#include <AMQP_ClientOperations.h>
+#include <FieldTable.h>
+#include <OutputHandler.h>
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl Fri Dec 1 02:56:58 2006
@@ -28,7 +28,7 @@
#include <sstream>
-#include <qpid/framing/AMQP_MethodVersionMap.h>
+#include <AMQP_MethodVersionMap.h>
namespace qpid
{
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl Fri Dec 1 02:56:58 2006
@@ -30,7 +30,7 @@
#define _METHOD_VERSION_MAP_H_
#include <map>
-#include <qpid/framing/AMQMethodBody.h>
+#include <AMQMethodBody.h>
%{MLIST} ${mc_method_body_include}
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl Fri Dec 1 02:56:58 2006
@@ -31,9 +31,9 @@
#include <sstream>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/ProtocolVersionException.h>
+#include <FieldTable.h>
+#include <ProtocolVersion.h>
+#include <ProtocolVersionException.h>
namespace qpid {
namespace framing {
@@ -62,7 +62,7 @@
}
// Include framing constant declarations
- #include <qpid/framing/AMQP_Constants.h>
+ #include <AMQP_Constants.h>
// Inner classes
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl Fri Dec 1 02:56:58 2006
@@ -28,8 +28,8 @@
#include <sstream>
-#include <qpid/framing/AMQP_ServerProxy.h>
-#include <qpid/framing/AMQFrame.h>
+#include <AMQP_ServerProxy.h>
+#include <AMQFrame.h>
%{MLIST} ${spc_method_body_include}
namespace qpid {
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl Fri Dec 1 02:56:58 2006
@@ -29,9 +29,9 @@
#ifndef _AMQP_ServerProxy_
#define _AMQP_ServerProxy_
-#include <qpid/framing/AMQP_ServerOperations.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/OutputHandler.h>
+#include <AMQP_ServerOperations.h>
+#include <FieldTable.h>
+#include <OutputHandler.h>
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl?view=diff&rev=481221&r1=481220&r2=481221
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl Fri Dec 1 02:56:58 2006
@@ -29,10 +29,10 @@
#include <string>
#include <sstream>
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQMethodBody.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/FieldTable.h>
+#include <amqp_types.h>
+#include <AMQMethodBody.h>
+#include <Buffer.h>
+#include <FieldTable.h>
#ifndef _${CLASS}${METHOD}Body_
#define _${CLASS}${METHOD}Body_