summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-07-17 12:25:26 +0100
committerEmile Joubert <emile@rabbitmq.com>2013-07-17 12:25:26 +0100
commit6d3359d8ae31cad35a86577e00396cc89a210e6d (patch)
tree99ec7abbb8b88dfdd9f1545405917c667eba3851
parent1e9fc58a2aa2c661fcd0f2568ccc24b2328622ee (diff)
parent5424a13ea86566789b3fb72096c9776cc37a1bd5 (diff)
downloadrabbitmq-server-6d3359d8ae31cad35a86577e00396cc89a210e6d.tar.gz
Merged stable into default
-rw-r--r--Makefile5
-rw-r--r--version.mk1
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9a6ad7a6..56d4b3c0 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,8 @@ endif
#other args: +native +"{hipe,[o3,verbose]}" -Ddebug=true +debug_info +no_strict_record_tests
ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call boolean_macro,$(USE_SPECS),use_specs) $(call boolean_macro,$(USE_PROPER_QC),use_proper_qc)
-VERSION?=0.0.0
+include version.mk
+
PLUGINS_SRC_DIR?=$(shell [ -d "plugins-src" ] && echo "plugins-src" || echo )
PLUGINS_DIR=plugins
TARBALL_NAME=rabbitmq-server-$(VERSION)
@@ -262,6 +263,8 @@ srcdist: distclean
cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
cp codegen.py Makefile generate_app generate_deps calculate-relative $(TARGET_SRC_DIR)
+ echo "VERSION?=${VERSION}" > $(TARGET_SRC_DIR)/version.mk
+
cp -r scripts $(TARGET_SRC_DIR)
cp -r $(DOCS_DIR) $(TARGET_SRC_DIR)
chmod 0755 $(TARGET_SRC_DIR)/scripts/*
diff --git a/version.mk b/version.mk
new file mode 100644
index 00000000..5683af4a
--- /dev/null
+++ b/version.mk
@@ -0,0 +1 @@
+VERSION?=0.0.0