merge default into amqp_0_9_1

15 files changed, 108 insertions, 13 deletions

diff --git a/Makefile.am b/Makefile.am
index 8f774b5..3153ad9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,3 +5,11 @@ squeakyclean: maintainer-clean
 	rm -f aclocal.m4
 	rm -f config.guess config.h.in* config.sub configure
 	rm -f depcomp install-sh ltmain.sh missing
+	rm -rf codegen
+
+codegen:
+	mkdir -p $@
+	cp -r "@AMQP_CODEGEN_DIR@"/* $@
+	$(MAKE) -C $@ clean
+
+EXTRA_DIST=codegen debian LICENSE-MPL-RabbitMQ
diff --git a/configure.ac b/configure.ac
index 3156079..db158ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,9 +20,16 @@ if test "x$GCC" = "xyes"; then
   fi
 fi
 
-sibling_codegen_dir=$(pwd)/../rabbitmq-codegen
-AMQP_CODEGEN_DIR=$(test -d $sibling_codegen_dir && echo $sibling_codegen_dir || echo codegen)
-AMQP_SPEC_JSON_PATH=$AMQP_CODEGEN_DIR/amqp-0.9.1.json
+AC_MSG_CHECKING(location of AMQP codegen directory)
+sibling_codegen_dir="$ac_abs_confdir/../rabbitmq-codegen"
+AMQP_CODEGEN_DIR=$(test -d "$sibling_codegen_dir" && echo "$sibling_codegen_dir" || echo "$ac_abs_confdir/codegen")
+AMQP_SPEC_JSON_PATH="$AMQP_CODEGEN_DIR/amqp-0.9.1.json"
+if test -f "$AMQP_SPEC_JSON_PATH"
+then
+  AC_MSG_RESULT($AMQP_CODEGEN_DIR)
+else
+  AC_MSG_ERROR(could not find AMQP spec file at "'$AMQP_SPEC_JSON_PATH'")
+fi
 
 AC_SUBST(AMQP_CODEGEN_DIR)
 AC_SUBST(AMQP_SPEC_JSON_PATH)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..b41f67e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+librabbitmq (1.0-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Tony Garnock-Jones <tonyg@lshift.net>  Tue, 14 Jul 2009 04:42:37 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..f107409
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,22 @@
+Source: librabbitmq
+Section: libs
+Priority: extra
+Maintainer: Tony Garnock-Jones <tonyg@lshift.net>
+Build-Depends: debhelper (>= 7), autoconf, automake, libtool, python (>= 2.5), python-simplejson
+Standards-Version: 3.8.1
+Homepage: http://www.rabbitmq.com/
+Vcs-Browser: http://hg.rabbitmq.com/rabbitmq-c
+
+Package: librabbitmq
+Architecture: any
+Section: libs
+Priority: extra
+Depends: 
+Description: An AMQP client library written in C
+
+Package: librabbitmq-dev
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: librabbitmq (= ${binary:Version}), libc-dev
+Description: developer's libraries and docs for librabbitmq
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..65cface
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,12 @@
+This package was debianized by Tony Garnock-Jones <tonyg@rabbitmq.com> on
+Tue, 14 Jul 2009 04:42:37 +0100.
+
+Upstream Author: Tony Garnock-Jones <tonyg@lshift.net>
+
+Copyright: 2009 Tony Garnock-Jones, 2009 LShift Ltd.
+
+License: This package, the RabbitMQ C client, is licensed under the
+MPL. For the MPL, please see LICENSE-MPL-RabbitMQ.
+
+If you have any questions regarding licensing, please contact us at 
+info@rabbitmq.com.
diff --git a/debian/librabbitmq-dev.docs b/debian/librabbitmq-dev.docs
new file mode 100644
index 0000000..92915e6
--- /dev/null
+++ b/debian/librabbitmq-dev.docs
@@ -0,0 +1,3 @@
+LICENSE-MPL-RabbitMQ
+
+
diff --git a/debian/librabbitmq-dev.install b/debian/librabbitmq-dev.install
new file mode 100644
index 0000000..093d1f5
--- /dev/null
+++ b/debian/librabbitmq-dev.install
@@ -0,0 +1,4 @@
+usr/include/*.h
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/*.so
diff --git a/debian/librabbitmq.docs b/debian/librabbitmq.docs
new file mode 100644
index 0000000..92915e6
--- /dev/null
+++ b/debian/librabbitmq.docs
@@ -0,0 +1,3 @@
+LICENSE-MPL-RabbitMQ
+
+
diff --git a/debian/librabbitmq.install b/debian/librabbitmq.install
new file mode 100644
index 0000000..3bd57d5
--- /dev/null
+++ b/debian/librabbitmq.install
@@ -0,0 +1,2 @@
+usr/lib/*.so.*
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..0cd8059
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+build: build-stamp
+build-stamp:
+	dh build
+	touch build-stamp
+
+clean:
+	dh clean
+	rm -f build-stamp
+	rm -f install-stamp
+
+install: build install-stamp
+install-stamp:
+	dh install --sourcedir=debian/tmp
+	touch install-stamp
+
+binary-arch: install
+	dh binary-arch
+
+binary-indep: install
+	dh binary-indep
+
+binary: binary-arch binary-indep
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 39c8fab..6ac915a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,10 +1,10 @@
 bin_PROGRAMS = amqp_sendstring amqp_exchange_declare amqp_listen amqp_producer amqp_consumer \
 	amqp_unbind amqp_bind
 
-AM_CFLAGS = -I../librabbitmq
-AM_LDFLAGS = ../librabbitmq/librabbitmq.la
+AM_CFLAGS = -I$(top_srcdir)/librabbitmq
+AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la
 
-nodist_INCLUDES = example_utils.h
+noinst_HEADERS = example_utils.h
 
 amqp_sendstring_SOURCES = amqp_sendstring.c example_utils.c
 amqp_exchange_declare_SOURCES = amqp_exchange_declare.c example_utils.c
diff --git a/librabbitmq/Makefile.am b/librabbitmq/Makefile.am
index 44b9d78..12dbd25 100644
--- a/librabbitmq/Makefile.am
+++ b/librabbitmq/Makefile.am
@@ -3,14 +3,17 @@ lib_LTLIBRARIES = librabbitmq.la
 librabbitmq_la_SOURCES = amqp_mem.c amqp_table.c amqp_connection.c amqp_socket.c amqp_debug.c amqp_api.c
 nodist_librabbitmq_la_SOURCES = amqp_framing.c
 include_HEADERS = amqp_framing.h amqp.h
-noinst_librabbitmq_la_INCLUDES = amqp_private.h
+noinst_HEADERS = amqp_private.h
 BUILT_SOURCES = amqp_framing.h amqp_framing.c
 CLEANFILES = amqp_framing.h amqp_framing.c
+EXTRA_DIST = codegen.py
 
 PYTHON = python2.5
 
-amqp_framing.h: $(AMQP_SPEC_JSON_PATH) codegen.py
-	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) codegen.py header $< $@
+CODEGEN_PY=$(srcdir)/codegen.py
 
-amqp_framing.c: $(AMQP_SPEC_JSON_PATH) codegen.py
-	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) codegen.py body $< $@
+amqp_framing.h: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY)
+	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $@
+
+amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY)
+	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@
diff --git a/librabbitmq/codegen.py b/librabbitmq/codegen.py
index aab6d95..42eed5e 100644
--- a/librabbitmq/codegen.py
+++ b/librabbitmq/codegen.py
@@ -294,6 +294,7 @@ int amqp_decode_properties(uint16_t class_id,
     partial_flags = D_16(encoded, offset);
     offset += 2;
     flags |= (partial_flags << (flagword_index * 16));
+    flagword_index++;
   } while (partial_flags & 1);
 
   switch (class_id) {"""
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dafdba4..1ac6faf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = test_tables
 
-AM_CFLAGS = -I../librabbitmq
-AM_LDFLAGS = ../librabbitmq/librabbitmq.la
+AM_CFLAGS = -I$(top_srcdir)/librabbitmq
+AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la