From fa9bf464a111549da2d6c7b51fc7eee321ebdc4c Mon Sep 17 00:00:00 2001 From: Michael Steinert Date: Tue, 15 May 2012 17:09:27 -0600 Subject: Convert to non-recursive Automake This change should speed up parallel builds considerably. It also simplifies the structure of the build system making it possible to properly track dependencies. Signed-off-by: Michael Steinert --- tools/Makefile.am | 31 ------- tools/doc/Makefile.am | 42 --------- tools/doc/amqp-consume.xml | 187 +++++++++++++++++++++++++++++++++++++++ tools/doc/amqp-declare-queue.xml | 122 +++++++++++++++++++++++++ tools/doc/amqp-delete-queue.xml | 94 ++++++++++++++++++++ tools/doc/amqp-get.xml | 95 ++++++++++++++++++++ tools/doc/amqp-publish.xml | 160 +++++++++++++++++++++++++++++++++ tools/doc/consume.xml | 187 --------------------------------------- tools/doc/declare_queue.xml | 122 ------------------------- tools/doc/delete_queue.xml | 94 -------------------- tools/doc/get.xml | 95 -------------------- tools/doc/publish.xml | 160 --------------------------------- 12 files changed, 658 insertions(+), 731 deletions(-) delete mode 100644 tools/Makefile.am delete mode 100644 tools/doc/Makefile.am create mode 100644 tools/doc/amqp-consume.xml create mode 100644 tools/doc/amqp-declare-queue.xml create mode 100644 tools/doc/amqp-delete-queue.xml create mode 100644 tools/doc/amqp-get.xml create mode 100644 tools/doc/amqp-publish.xml delete mode 100644 tools/doc/consume.xml delete mode 100644 tools/doc/declare_queue.xml delete mode 100644 tools/doc/delete_queue.xml delete mode 100644 tools/doc/get.xml delete mode 100644 tools/doc/publish.xml (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 6fa1e4b..0000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -SUBDIRS=doc - -bin_PROGRAMS = amqp-publish amqp-get amqp-consume amqp-declare-queue amqp-delete-queue - -# The -I to srcdir's librabbitmq is for the main amqp header -# files. The -I to builddir's librabbitmq is less obvious; it's for -# VPATH-based builds: the amqp_framing.h gets generated into the -# *build* directory, not the source directory. -AM_CFLAGS = -I$(top_srcdir)/librabbitmq -I$(srcdir)/$(PLATFORM_DIR) -I$(top_builddir)/librabbitmq -AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la - -LDADD=$(LIBPOPT) - -noinst_HEADERS = common.h $(PLATFORM_DIR)/process.h - -COMMON_SOURCES = common.c - -if WINDOWS -COMMON_SOURCES += windows/compat.c -endif - -amqp_publish_SOURCES = publish.c $(COMMON_SOURCES) -amqp_get_SOURCES = get.c $(COMMON_SOURCES) -amqp_consume_SOURCES = consume.c $(PLATFORM_DIR)/process.c $(COMMON_SOURCES) -amqp_declare_queue_SOURCES = declare_queue.c $(COMMON_SOURCES) -amqp_delete_queue_SOURCES = delete_queue.c $(COMMON_SOURCES) - -EXTRA_DIST = \ - unix/process.c unix/process.h \ - windows/process.c windows/process.h \ - windows/compat.c windows/compat.h diff --git a/tools/doc/Makefile.am b/tools/doc/Makefile.am deleted file mode 100644 index f482d94..0000000 --- a/tools/doc/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -EXTRA_DIST = \ - publish.xml \ - consume.xml \ - get.xml \ - declare_queue.xml \ - delete_queue.xml \ - librabbitmq-tools.xml - -if TOOLS_DOC -man_MANS = \ - amqp-publish.1 \ - amqp-consume.1 \ - amqp-get.1 \ - amqp-declare-queue.1 \ - amqp-delete-queue.1 \ - librabbitmq-tools.7 -MOSTLYCLEANFILES = man-date.ent $(man_MANS) - -# automake complains about % pattern rules, and suffix rules don't -# support multiple dependencies, so we have to expand all these out. -# -# Also, xmlto's --searchpath doesn't get passed through to xmllint, so -# we disable xmllint validation with --skip-validation for the benefit -# of build/source separation as required by distcheck, debian -# packaging etc. -amqp-publish.1: publish.xml man-date.ent - $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< -amqp-consume.1: consume.xml man-date.ent - $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< -amqp-get.1: get.xml man-date.ent - $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< -amqp-declare-queue.1: declare_queue.xml man-date.ent - $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< -amqp-delete-queue.1: delete_queue.xml man-date.ent - $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< -librabbitmq-tools.7: librabbitmq-tools.xml man-date.ent - $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< - -man-date.ent: - date +'%Y-%m-%d' >$@ - -endif diff --git a/tools/doc/amqp-consume.xml b/tools/doc/amqp-consume.xml new file mode 100644 index 0000000..b5f40d7 --- /dev/null +++ b/tools/doc/amqp-consume.xml @@ -0,0 +1,187 @@ + + +] +> + + + RabbitMQ C Client + + The RabbitMQ Team <info@rabbitmq.com> + + &date; + + + + amqp-consume + 1 + RabbitMQ C Client + + + + amqp-consume + Consume messages from a queue on an AMQP server + + + + + amqp-consume + + OPTION + + + command + + + args + + + + + + Description + + amqp-consume consumes messages from a + queue on an AMQP server. For each message that arrives, a + receiving command is run, with the message body supplied + to it on standard input. + + + amqp-consume can consume from an + existing queue, or it can create a new queue. It can + optionally bind the queue to an existing exchange. + + + By default, messages will be consumed with explicit + acknowledgements. A message will only be acknowledged if + the receiving command exits successfully (i.e. with an + exit code of zero). The AMQP no ack mode + (a.k.a. auto-ack mode) can be enable with the + option. + + + + + Options + + + + =queue name + + + The name of the queue to consume messages + from. + + + + If the option is + omitted, the AMQP server will assign a unique + name to the queue, and that server-assigned + name will be dixsplayed on stderr; this case + implies that an exclusive queue should be + declared. + + + + + + =exchange name + + + Specifies that an exclusive queue should + be declared, and bound to the given exchange. + The specified exchange should already exist + unless the + option is used to request the creation of an + exchange. + + + + + + =routing key + + + The routing key for binding. If omitted, an + empty routing key is assumed. + + + + + + + + + Forces an exclusive queue to be declared, + even when it otherwise would not be. That is, + when a queue name is specified with the + option, but no + binding to an exchange is requested with the + option. + + + + + + =routing key + + + Enable no ack mode: The AMQP + server will unconditionally acknowledge each + message that is delivered, regardless of + whether the target command exits successfully + or not. + + + + + + =limit + + + Stop consuming after the given number of + messages have been received. + + + + + + + + Examples + + + Consume messages from an existing queue + myqueue, and + output the message bodies on standard output via + cat: + + $ amqp-publish -q myqueue cat + + + + + Bind a new exclusive queue to an + exchange myexch, and send + each message body to the script + myscript, automatically + acknowledging them on the server: + + $ amqp-consume -A -e myexch ./myscript + + + + + + + See also + + librabbitmq-tools7 + describes connection-related options common to all the + RabbitMQ C Client tools. + + + diff --git a/tools/doc/amqp-declare-queue.xml b/tools/doc/amqp-declare-queue.xml new file mode 100644 index 0000000..0fc0440 --- /dev/null +++ b/tools/doc/amqp-declare-queue.xml @@ -0,0 +1,122 @@ + + +] +> + + + RabbitMQ C Client + + The RabbitMQ Team <info@rabbitmq.com> + + &date; + + + + amqp-declare-queue + 1 + RabbitMQ C Client + + + + amqp-declare-queue + Declare (create or assert the existence of) a queue on an AMQP server + + + + + amqp-declare-queue + + OPTION + + -d + -q queue name + + + + + Description + + amqp-declare-queue attempts to create a + queue on an AMQP server, and exits. If the empty-string is + supplied as the queue name, a fresh queue name is + generated by the server and returned. In all cases, if a + queue was successfully declared, the (raw binary) name of + the queue is printed to standard output, followed by a + newline. + + + + + Options + + + + =queue name + + + The name of the queue to declare. If the + empty string is supplied, a fresh queue name + is generated by the server. + + + + + + + + + Causes the queue to be declared with the + "durable" flag set. Durable queues survive + server restarts. By default, queues are declared + in "transient" mode. + + + + + + + + Exit Status + + If the queue was successfully declared, the exit status is + 0. If an error occurs, the exit status is 1. + + + + + Examples + + + Declare the durable queue myqueue, and + display the name of the queue on standard output: + + $ amqp-declare-queue -d -q myqueue +myqueue + + + + Declare a fresh, server-named transient queue, + and display the name of the queue on standard output + (use amqp-delete-queue + 1 to delete + it from the server once you're done): + + $ amqp-declare-queue -q "" +amq.gen-BW/wvociA8g6LFpb1PlqOA== + + + + + + + See also + + librabbitmq-tools7 + describes connection-related options common to all the + RabbitMQ C Client tools. + + + diff --git a/tools/doc/amqp-delete-queue.xml b/tools/doc/amqp-delete-queue.xml new file mode 100644 index 0000000..040a384 --- /dev/null +++ b/tools/doc/amqp-delete-queue.xml @@ -0,0 +1,94 @@ + + +] +> + + + RabbitMQ C Client + + The RabbitMQ Team <info@rabbitmq.com> + + &date; + + + + amqp-delete-queue + 1 + RabbitMQ C Client + + + + amqp-delete-queue + Delete a queue from an AMQP server + + + + + amqp-delete-queue + + OPTION + + -q queue name + + + + + Description + + amqp-delete-queue deletes a queue from + an AMQP server, and exits after printing to standard + output the number of messages that were in the queue at + the time of its deletion. + + + + + Options + + + + =queue name + + + The name of the queue to delete. + + + + + + + + Exit Status + + If the queue was successfully deleted, the exit status is + 0. If an error occurs, the exit status is 1. + + + + + Examples + + + Delete the + queue myqueue + at a moment when it has 123 messages waiting on + it: + + $ amqp-delete-queue -q myqueue +123 + + + + + + + See also + + librabbitmq-tools7 + describes connection-related options common to all the + RabbitMQ C Client tools. + + + diff --git a/tools/doc/amqp-get.xml b/tools/doc/amqp-get.xml new file mode 100644 index 0000000..08abe2b --- /dev/null +++ b/tools/doc/amqp-get.xml @@ -0,0 +1,95 @@ + + +] +> + + + RabbitMQ C Client + + The RabbitMQ Team <info@rabbitmq.com> + + &date; + + + + amqp-get + 1 + RabbitMQ C Client + + + + amqp-get + Get a message from a queue on an AMQP server + + + + + amqp-get + + OPTION + + -q queue name + + + + + Description + + amqp-get attempts to consume a single + message from a queue on an AMQP server, and exits. Unless + the queue was empty, the body of the resulting message is + sent to standard output. + + + + + Options + + + + =queue name + + + The name of the queue to consume messages + from. + + + + + + + + Exit Status + + If the queue is not empty, and a message is successfully + retrieved, the exit status is 0. If an error occurs, the + exit status is 1. If the queue is found to be empty, the + exit status is 2. + + + + + Examples + + + Get a message from the queue myqueue, and + display its body on standard output: + + $ amqp-get -q myqueue + + + + + + + See also + + librabbitmq-tools7 + describes connection-related options common to all the + RabbitMQ C Client tools. + + + diff --git a/tools/doc/amqp-publish.xml b/tools/doc/amqp-publish.xml new file mode 100644 index 0000000..e609972 --- /dev/null +++ b/tools/doc/amqp-publish.xml @@ -0,0 +1,160 @@ + + +] +> + + + RabbitMQ C Client + + The RabbitMQ Team <info@rabbitmq.com> + + &date; + + + + amqp-publish + 1 + RabbitMQ C Client + + + + amqp-publish + Publish a message on an AMQP server + + + + + amqp-publish + + OPTION + + + + + + Description + + Publishes a message to an exchange on an AMQP server. + Options allow the various properties of the message and + parameters of the AMQP basic.publish + method to be specified. + + + By default, the message body is read from standard input. + Alternatively, the option allows the message + body to be provided as part of the command. + + + + + Options + + + + =exchange name + + + The name of the exchange to publish to. If + omitted, the default exchange (also known as + the nameless exchange) is used. + + + + + + =routing key + + + The routing key to publish with. If omitted, + an empty routing key is assumed. A routing + key must be specified when publishing to the + default exchange; in that case, accoding to + the AMQP specification, the routing key + corresponds to a queue name. + + + + + + + + + Use the persistent delivery mode. Without + this option, non-persistent delivery is used. + + + + + + =MIME type + + + Specifies the content-type property for the + message. If omitted, the content-type + property is not set on the message. + + + + + + =content coding + + + Specifies the content-encoding property for + the message. If omitted, the content-encoding + property is not set on the message. + + + + + + =message body + + + Specifies the message body. If omitted, the + message body is read from standard input. + + + + + + + + Examples + + + Send a short message, consisting of the word + Hello to the queue + myqueue via the + default exchange: + + $ amqp-publish -r myqueue -b Hello + + + + + Send some XML data from a file to the exchange + events, with + persistent delivery mode, setting the content-type + property on the message to make the data format + explicit: + + $ amqp-publish -e events -p -C text/xml <event.xml + + + + + + + See also + + librabbitmq-tools7 + describes connection-related options common to all the + RabbitMQ C Client tools. + + + diff --git a/tools/doc/consume.xml b/tools/doc/consume.xml deleted file mode 100644 index b5f40d7..0000000 --- a/tools/doc/consume.xml +++ /dev/null @@ -1,187 +0,0 @@ - - -] -> - - - RabbitMQ C Client - - The RabbitMQ Team <info@rabbitmq.com> - - &date; - - - - amqp-consume - 1 - RabbitMQ C Client - - - - amqp-consume - Consume messages from a queue on an AMQP server - - - - - amqp-consume - - OPTION - - - command - - - args - - - - - - Description - - amqp-consume consumes messages from a - queue on an AMQP server. For each message that arrives, a - receiving command is run, with the message body supplied - to it on standard input. - - - amqp-consume can consume from an - existing queue, or it can create a new queue. It can - optionally bind the queue to an existing exchange. - - - By default, messages will be consumed with explicit - acknowledgements. A message will only be acknowledged if - the receiving command exits successfully (i.e. with an - exit code of zero). The AMQP no ack mode - (a.k.a. auto-ack mode) can be enable with the - option. - - - - - Options - - - - =queue name - - - The name of the queue to consume messages - from. - - - - If the option is - omitted, the AMQP server will assign a unique - name to the queue, and that server-assigned - name will be dixsplayed on stderr; this case - implies that an exclusive queue should be - declared. - - - - - - =exchange name - - - Specifies that an exclusive queue should - be declared, and bound to the given exchange. - The specified exchange should already exist - unless the - option is used to request the creation of an - exchange. - - - - - - =routing key - - - The routing key for binding. If omitted, an - empty routing key is assumed. - - - - - - - - - Forces an exclusive queue to be declared, - even when it otherwise would not be. That is, - when a queue name is specified with the - option, but no - binding to an exchange is requested with the - option. - - - - - - =routing key - - - Enable no ack mode: The AMQP - server will unconditionally acknowledge each - message that is delivered, regardless of - whether the target command exits successfully - or not. - - - - - - =limit - - - Stop consuming after the given number of - messages have been received. - - - - - - - - Examples - - - Consume messages from an existing queue - myqueue, and - output the message bodies on standard output via - cat: - - $ amqp-publish -q myqueue cat - - - - - Bind a new exclusive queue to an - exchange myexch, and send - each message body to the script - myscript, automatically - acknowledging them on the server: - - $ amqp-consume -A -e myexch ./myscript - - - - - - - See also - - librabbitmq-tools7 - describes connection-related options common to all the - RabbitMQ C Client tools. - - - diff --git a/tools/doc/declare_queue.xml b/tools/doc/declare_queue.xml deleted file mode 100644 index 0fc0440..0000000 --- a/tools/doc/declare_queue.xml +++ /dev/null @@ -1,122 +0,0 @@ - - -] -> - - - RabbitMQ C Client - - The RabbitMQ Team <info@rabbitmq.com> - - &date; - - - - amqp-declare-queue - 1 - RabbitMQ C Client - - - - amqp-declare-queue - Declare (create or assert the existence of) a queue on an AMQP server - - - - - amqp-declare-queue - - OPTION - - -d - -q queue name - - - - - Description - - amqp-declare-queue attempts to create a - queue on an AMQP server, and exits. If the empty-string is - supplied as the queue name, a fresh queue name is - generated by the server and returned. In all cases, if a - queue was successfully declared, the (raw binary) name of - the queue is printed to standard output, followed by a - newline. - - - - - Options - - - - =queue name - - - The name of the queue to declare. If the - empty string is supplied, a fresh queue name - is generated by the server. - - - - - - - - - Causes the queue to be declared with the - "durable" flag set. Durable queues survive - server restarts. By default, queues are declared - in "transient" mode. - - - - - - - - Exit Status - - If the queue was successfully declared, the exit status is - 0. If an error occurs, the exit status is 1. - - - - - Examples - - - Declare the durable queue myqueue, and - display the name of the queue on standard output: - - $ amqp-declare-queue -d -q myqueue -myqueue - - - - Declare a fresh, server-named transient queue, - and display the name of the queue on standard output - (use amqp-delete-queue - 1 to delete - it from the server once you're done): - - $ amqp-declare-queue -q "" -amq.gen-BW/wvociA8g6LFpb1PlqOA== - - - - - - - See also - - librabbitmq-tools7 - describes connection-related options common to all the - RabbitMQ C Client tools. - - - diff --git a/tools/doc/delete_queue.xml b/tools/doc/delete_queue.xml deleted file mode 100644 index 040a384..0000000 --- a/tools/doc/delete_queue.xml +++ /dev/null @@ -1,94 +0,0 @@ - - -] -> - - - RabbitMQ C Client - - The RabbitMQ Team <info@rabbitmq.com> - - &date; - - - - amqp-delete-queue - 1 - RabbitMQ C Client - - - - amqp-delete-queue - Delete a queue from an AMQP server - - - - - amqp-delete-queue - - OPTION - - -q queue name - - - - - Description - - amqp-delete-queue deletes a queue from - an AMQP server, and exits after printing to standard - output the number of messages that were in the queue at - the time of its deletion. - - - - - Options - - - - =queue name - - - The name of the queue to delete. - - - - - - - - Exit Status - - If the queue was successfully deleted, the exit status is - 0. If an error occurs, the exit status is 1. - - - - - Examples - - - Delete the - queue myqueue - at a moment when it has 123 messages waiting on - it: - - $ amqp-delete-queue -q myqueue -123 - - - - - - - See also - - librabbitmq-tools7 - describes connection-related options common to all the - RabbitMQ C Client tools. - - - diff --git a/tools/doc/get.xml b/tools/doc/get.xml deleted file mode 100644 index 08abe2b..0000000 --- a/tools/doc/get.xml +++ /dev/null @@ -1,95 +0,0 @@ - - -] -> - - - RabbitMQ C Client - - The RabbitMQ Team <info@rabbitmq.com> - - &date; - - - - amqp-get - 1 - RabbitMQ C Client - - - - amqp-get - Get a message from a queue on an AMQP server - - - - - amqp-get - - OPTION - - -q queue name - - - - - Description - - amqp-get attempts to consume a single - message from a queue on an AMQP server, and exits. Unless - the queue was empty, the body of the resulting message is - sent to standard output. - - - - - Options - - - - =queue name - - - The name of the queue to consume messages - from. - - - - - - - - Exit Status - - If the queue is not empty, and a message is successfully - retrieved, the exit status is 0. If an error occurs, the - exit status is 1. If the queue is found to be empty, the - exit status is 2. - - - - - Examples - - - Get a message from the queue myqueue, and - display its body on standard output: - - $ amqp-get -q myqueue - - - - - - - See also - - librabbitmq-tools7 - describes connection-related options common to all the - RabbitMQ C Client tools. - - - diff --git a/tools/doc/publish.xml b/tools/doc/publish.xml deleted file mode 100644 index e609972..0000000 --- a/tools/doc/publish.xml +++ /dev/null @@ -1,160 +0,0 @@ - - -] -> - - - RabbitMQ C Client - - The RabbitMQ Team <info@rabbitmq.com> - - &date; - - - - amqp-publish - 1 - RabbitMQ C Client - - - - amqp-publish - Publish a message on an AMQP server - - - - - amqp-publish - - OPTION - - - - - - Description - - Publishes a message to an exchange on an AMQP server. - Options allow the various properties of the message and - parameters of the AMQP basic.publish - method to be specified. - - - By default, the message body is read from standard input. - Alternatively, the option allows the message - body to be provided as part of the command. - - - - - Options - - - - =exchange name - - - The name of the exchange to publish to. If - omitted, the default exchange (also known as - the nameless exchange) is used. - - - - - - =routing key - - - The routing key to publish with. If omitted, - an empty routing key is assumed. A routing - key must be specified when publishing to the - default exchange; in that case, accoding to - the AMQP specification, the routing key - corresponds to a queue name. - - - - - - - - - Use the persistent delivery mode. Without - this option, non-persistent delivery is used. - - - - - - =MIME type - - - Specifies the content-type property for the - message. If omitted, the content-type - property is not set on the message. - - - - - - =content coding - - - Specifies the content-encoding property for - the message. If omitted, the content-encoding - property is not set on the message. - - - - - - =message body - - - Specifies the message body. If omitted, the - message body is read from standard input. - - - - - - - - Examples - - - Send a short message, consisting of the word - Hello to the queue - myqueue via the - default exchange: - - $ amqp-publish -r myqueue -b Hello - - - - - Send some XML data from a file to the exchange - events, with - persistent delivery mode, setting the content-type - property on the message to make the data format - explicit: - - $ amqp-publish -e events -p -C text/xml <event.xml - - - - - - - See also - - librabbitmq-tools7 - describes connection-related options common to all the - RabbitMQ C Client tools. - - - -- cgit v1.2.1