Permalink
Browse files

updates diff

  • Loading branch information...
1 parent 82b8adb commit 0e7710e147125e44bb642eb85369fe1e8aaf8801 @videlalvaro committed Apr 20, 2012
Showing with 39 additions and 41 deletions.
  1. +39 −41 release.branch.diff
View
@@ -1,6 +1,6 @@
-diff -r 60755ae0eee9 -r 2545616b505b Makefile
+diff -r 60755ae0eee9 -r 611b26fd4b1b Makefile
--- a/Makefile Thu Apr 12 18:38:34 2012 +0100
-+++ b/Makefile Fri Apr 20 01:51:11 2012 +0200
++++ b/Makefile Fri Apr 20 02:41:53 2012 +0200
@@ -62,6 +62,12 @@
TARBALL_NAME=rabbitmq-server-$(VERSION)
TARGET_SRC_DIR=dist/$(TARBALL_NAME)
@@ -56,7 +56,7 @@ diff -r 60755ae0eee9 -r 2545616b505b Makefile
+# add minimal boot file
+ cp $(ERTS_ROOT_DIR)/bin/start_clean.boot $(RLS_DIR)/releases/$(VERSION)
+# add README file
-+ sed 's/%%VSN%%/$(VERSION)/' pre-release/templates/README > $(RLS_DIR)/README
++ cp pre-release/templates/README > $(RLS_DIR)/README
+# add LICENSE files
+ cp LICENSE LICENSE-MPL-RabbitMQ $(RLS_DIR)
+# add VERSION file
@@ -74,9 +74,9 @@ diff -r 60755ae0eee9 -r 2545616b505b Makefile
srcdist: distclean
mkdir -p $(TARGET_SRC_DIR)/codegen
cp -r ebin src include LICENSE LICENSE-MPL-RabbitMQ INSTALL README $(TARGET_SRC_DIR)
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/scripts/make_rel
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/scripts/make_rel
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/scripts/make_rel Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/scripts/make_rel Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,25 @@
+#!/bin/sh
+
@@ -104,59 +104,57 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/scripts/make_rel
+ -s rabbit_release \
+ -extra "$RABBITMQ_ENABLED_PLUGINS_FILE" "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_HOME}"
\ No newline at end of file
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/README
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/README Fri Apr 20 01:51:11 2012 +0200
-@@ -0,0 +1,29 @@
++++ b/pre-release/templates/README Fri Apr 20 02:41:53 2012 +0200
+@@ -0,0 +1,27 @@
+# NOTE: This is an unofficial release not supported by the RabbitMQ team #
+
-+Running RabbitMQ
++## Starting RabbitMQ ##
+
-+Before running the server do:
++ $ ./bin/start_server
+
-+ $ ./bin/post_install.sh
++## Stoping RabbitMQ ##
+
-+That script will set the right path for the Erlang runtime that is distributed with this package.
++ $ ./bin/stop_server
+
-+Then to run the server do:
++## Configuration ##
+
-+ $ ./lib/rabbit-%%VSN%%/sbin/rabbitmq-server
++The server user and password are the default ones `guest:guest`
+
-+If you want to run the server in the background the do:
++This release comes with the Management Plugin already installed. To use it open http://localhost:55672
+
-+ $ ./lib/rabbit-%%VSN%%/sbin/rabbitmq-server -detached
++## Documentation ##
+
-+To stop the server run:
++For documentation see:
+
-+ $ ./lib/rabbit-%%VSN%%/sbin/rabbitmqctl stop
++[http://www.rabbitmq.com/documentation.html](http://www.rabbitmq.com/documentation.html).
+
-+This release comes with the Management Plugin already installed. To use it open http://localhost:55672
++# LICENSE #
+
-+The server user and passwords are the default ones `guest:guest`
-+
-+For documentation see:
++This work is licensed under the Mozilla Public License as stated here: [http://www.rabbitmq.com/mpl.html](http://www.rabbitmq.com/mpl.html).
+
-+http://www.rabbitmq.com/documentation.html
++The Erlang ERTS is distributed according to the Erlang Public License: [http://www.erlang.org/EPLICENSE](http://www.erlang.org/EPLICENSE).
\ No newline at end of file
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/enabled_plugins
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/enabled_plugins
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/enabled_plugins Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/templates/enabled_plugins Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,1 @@
+[rabbitmq_management].
\ No newline at end of file
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/post_install.sh
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/post_install.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/post_install.sh Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/templates/post_install.sh Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,6 @@
+#!/bin/sh
+ROOT="`pwd`"
+DIR=./erts-%%ERTS_VSN%%/bin
+sed s:%FINAL_ROOTDIR%:\""${ROOT}"\": $DIR/erl.src > $DIR/erl.tmp
+sed s:\$BINDIR:\"\$BINDIR\": $DIR/erl.tmp > $DIR/erl
+rm $DIR/erl.tmp
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-defaults
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/rabbitmq-defaults
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/rabbitmq-defaults Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/templates/rabbitmq-defaults Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,34 @@
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
@@ -193,9 +191,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-defaults
+BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start"
+GENERIC_BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start_clean"
\ No newline at end of file
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-env
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/rabbitmq-env
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/rabbitmq-env Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/templates/rabbitmq-env Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,51 @@
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
@@ -248,9 +246,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-env
+
+## Get configuration variables from the configure environment file
+[ -f "${CONF_ENV_FILE}" ] && . "${CONF_ENV_FILE}"
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-server
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/rabbitmq-server
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/rabbitmq-server Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/templates/rabbitmq-server Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,109 @@
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
@@ -361,9 +359,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-server
+ ${RABBITMQ_SERVER_START_ARGS} \
+ "$@"
+
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmqctl
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/rabbitmqctl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/rabbitmqctl Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/templates/rabbitmqctl Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,40 @@
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
@@ -405,9 +403,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmqctl
+ -s rabbit_control \
+ -nodename $RABBITMQ_NODENAME \
+ -extra "$@"
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/start_server
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/start_server
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/start_server Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/templates/start_server Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,30 @@
+#!/bin/sh
+EPMD_ROOT=./%%ERTS_VSN%%/bin
@@ -440,9 +438,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/start_server
+
+exit 0
\ No newline at end of file
-diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/stop_server
+diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/stop_server
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/pre-release/templates/stop_server Fri Apr 20 01:51:11 2012 +0200
++++ b/pre-release/templates/stop_server Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,25 @@
+#!/bin/sh
+EPMD_ROOT=./%%ERTS_VSN%%/bin
@@ -469,9 +467,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/stop_server
+done
+
+"${EPMD_ROOT}"/epmd -names | grep -q name || epmd -kill > /dev/null
-diff -r 60755ae0eee9 -r 2545616b505b src/rabbit_release.erl
+diff -r 60755ae0eee9 -r 611b26fd4b1b src/rabbit_release.erl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/rabbit_release.erl Fri Apr 20 01:51:11 2012 +0200
++++ b/src/rabbit_release.erl Fri Apr 20 02:41:53 2012 +0200
@@ -0,0 +1,185 @@
+-module(rabbit_release).
+

0 comments on commit 0e7710e

Please sign in to comment.