From 4351730550bc48c4237de4e616f8e420e084c081 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 15 Feb 2008 08:26:00 +0000 Subject: * updated c++ build to work with recent gentools changes * add null exchange.bound impl to SessionHandlerImpl (to reflect change to spec file) * pass AMQDataBlocks rather than AMQFrames to OutputHandler * allow client to pass messages frames to io layer in one go (via FrameList) if it will fit in a single buffer git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@627971 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/gen/Makefile.am | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'cpp/gen') diff --git a/cpp/gen/Makefile.am b/cpp/gen/Makefile.am index 3398f01330..61ec38bbaa 100644 --- a/cpp/gen/Makefile.am +++ b/cpp/gen/Makefile.am @@ -32,16 +32,21 @@ DISTCLEANFILES = $(BUILT_SOURCES) timestamp gen-src.mk # if CAN_GENERATE_CODE + gentools_dir = $(srcdir)/../../gentools spec_dir = $(srcdir)/../../specs spec = $(spec_dir)/amqp.0-8.xml gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools +gentools_libs = $(gentools_dir)/lib/velocity-1.4.jar:$(gentools_dir)/lib/velocity-dep-1.4.jar $(BUILT_SOURCES) timestamp: $(spec) $(java_sources) $(cxx_templates) rm -f $(generated_sources) - cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java - $(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \ + cd $(gentools_srcdir) && rm -f *.class + $(JAVAC) -cp $(gentools_libs) -sourcepath $(gentools_srcdir) -d $(gentools_dir)/src $(gentools_srcdir)/*.java + $(JAVA) -cp $(gentools_dir)/src:$(gentools_libs) org.apache.qpid.gentools.Main \ -c -o . -t $(gentools_dir)/templ.cpp $(spec) + echo $(JAVA) -cp $(gentools_dir)/src:$(gentools_libs) org.apache.qpid.gentools.Main \ + -c -o . -t $(gentools_dir)/templ.cpp $(spec) >> debug touch timestamp gen-src.mk: timestamp -- cgit v1.2.1