Merging bug 21606 into default

common.mk

@@ -127,15 +127,13 @@ ALL_SSL_COVERAGE := true
 SSL_BROKER_ARGS :=
 endif
 
-PLT=$(HOME)/.dialyzer_plt
-DIALYZER_CALL=dialyzer --plt $(PLT)
+RABBIT_PLT=$(BROKER_DIR)/rabbit.plt
 
-.PHONY: all compile compile_tests run run_in_broker dialyzer dialyze_all \
-	add_broker_to_plt prepare_tests all_tests test_suites \
-	test_suites_coverage run_test_broker start_test_broker_node \
-	stop_test_broker_node test_network test_direct test_network_coverage \
-	test_direct_coverage test_common_package clean source_tarball package \
-	boot_broker unboot_broker
+.PHONY: all compile compile_tests run run_in_broker dialyze $(RABBIT_PLT) \
+	prepare_tests all_tests test_suites test_suites_coverage run_test_broker
+	start_test_broker_node stop_test_broker_node test_network test_direct
+	test_network_coverage test_direct_coverage test_common_package clean \
+	source_tarball package boot_broker unboot_broker
 
 all: package
 
@@ -156,21 +154,9 @@ run: compile $(EBIN_DIR)/$(PACKAGE).app
 run_in_broker: compile $(BROKER_DIR) $(EBIN_DIR)/$(PACKAGE).app
 	$(MAKE) RABBITMQ_SERVER_START_ARGS='$(PA_LOAD_PATH)' -C $(BROKER_DIR) run
 
-dialyze: $(TARGETS)
-	$(DIALYZER_CALL) -c $^
-
-dialyze_all: $(TARGETS) $(TEST_TARGETS)
-	$(DIALYZER_CALL) -c $^
-
-add_broker_to_plt: $(BROKER_DIR)/ebin
-	$(DIALYZER_CALL) --add_to_plt -r $<
-
-$(DOC_DIR)/overview.edoc: $(SOURCE_DIR)/overview.edoc.in
-	mkdir -p $(DOC_DIR)
-	sed -e 's:%%VERSION%%:$(VERSION):g' < $< > $@
-
-$(DOC_DIR)/index.html: $(COMPILE_DEPS) $(DOC_DIR)/overview.edoc $(SOURCES)
-	$(LIBS_PATH) erl -noshell -eval 'edoc:application(amqp_client, ".", [{preprocess, true}])' -run init stop
+dialyze: $(RABBIT_PLT) $(TARGETS) compile_tests
+	$(LIBS_PATH) erl -noshell -pa $(LOAD_PATH) -eval \
+        "rabbit_dialyzer:halt_with_code(rabbit_dialyzer:dialyze_files(\"$(RABBIT_PLT)\", \"$(TARGETS) $(TEST_TARGETS)\"))."
 
 doc: $(DOC_DIR)/index.html
 
@@ -212,3 +198,12 @@ $(DIST_DIR):
 $(DEPS_DIR):
 	mkdir -p $@
 
+$(RABBIT_PLT):
+	$(MAKE) -C $(BROKER_DIR) create-plt
+
+$(DOC_DIR)/overview.edoc: $(SOURCE_DIR)/overview.edoc.in
+	mkdir -p $(DOC_DIR)
+	sed -e 's:%%VERSION%%:$(VERSION):g' < $< > $@
+
+$(DOC_DIR)/index.html: $(COMPILE_DEPS) $(DOC_DIR)/overview.edoc $(SOURCES)
+	$(LIBS_PATH) erl -noshell -eval 'edoc:application(amqp_client, ".", [{preprocess, true}])' -run init stop

test.mk

@@ -1,3 +1,28 @@
+#   The contents of this file are subject to the Mozilla Public License
+#   Version 1.1 (the "License"); you may not use this file except in
+#   compliance with the License. You may obtain a copy of the License at
+#   http://www.mozilla.org/MPL/
+#
+#   Software distributed under the License is distributed on an "AS IS"
+#   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+#   License for the specific language governing rights and limitations
+#   under the License.
+#
+#   The Original Code is the RabbitMQ Erlang Client.
+#
+#   The Initial Developers of the Original Code are LShift Ltd.,
+#   Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+#
+#   Portions created by LShift Ltd., Cohesive Financial
+#   Technologies LLC., and Rabbit Technologies Ltd. are Copyright (C)
+#   2007 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
+#   Technologies Ltd.;
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): ______________________
+#
+
 prepare_tests: compile compile_tests
 
 all_tests: prepare_tests