Skip to content

Commit

Permalink
updates diff
Browse files Browse the repository at this point in the history
  • Loading branch information
@videlalvaro
videlalvaro committed Apr 18, 2012
1 parent 510bbfc commit faf7b5a
Showing 1 changed file with 64 additions and 27 deletions.
91 changes: 64 additions & 27 deletions release.branch.diff
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -r 60755ae0eee9 -r 9cbb98401fa9 Makefile
diff -r 60755ae0eee9 -r a4352bbdb6e7 Makefile
--- a/Makefile Thu Apr 12 18:38:34 2012 +0100
+++ b/Makefile Tue Apr 17 02:39:47 2012 +0200
+++ b/Makefile Wed Apr 18 14:43:07 2012 +0200
@@ -62,6 +62,12 @@
TARBALL_NAME=rabbitmq-server-$(VERSION)
TARGET_SRC_DIR=dist/$(TARBALL_NAME)
Expand All @@ -14,7 +14,7 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 Makefile
SIBLING_CODEGEN_DIR=../rabbitmq-codegen/
AMQP_CODEGEN_DIR=$(shell [ -d $(SIBLING_CODEGEN_DIR) ] && echo $(SIBLING_CODEGEN_DIR) || echo codegen)
AMQP_SPEC_JSON_FILES_0_9_1=$(AMQP_CODEGEN_DIR)/amqp-rabbitmq-0.9.1.json
@@ -243,6 +249,55 @@
@@ -243,6 +249,59 @@

########################################################################

Expand Down Expand Up @@ -61,6 +61,10 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 Makefile
+ cp LICENSE LICENSE-MPL-RabbitMQ $(RLS_DIR)
+# add VERSION file
+ echo "$(VERSION)" > $(RLS_DIR)/VERSION
+# add etc and var dirs
+ mkdir -p $(RLS_DIR)/etc/rabbitmq
+ mkdir -p $(RLS_DIR)/var/log/rabbitmq
+ mkdir -p $(RLS_DIR)/var/lib/rabbitmq/mnesia
+# generate final tar
+ (cd $(RLS_BUILD_DIR); tar -zchf $(TARBALL_NAME).tar.gz $(TARBALL_NAME))
+# clean up
Expand All @@ -70,9 +74,9 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 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 9cbb98401fa9 pre-release/scripts/make_rel
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/scripts/make_rel
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/scripts/make_rel Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/scripts/make_rel Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,25 @@
+#!/bin/sh
+
Expand Down Expand Up @@ -100,9 +104,9 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 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 9cbb98401fa9 pre-release/templates/README
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/README Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/README Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,29 @@
+# NOTE: This is an unofficial release not supported by the RabbitMQ team #
+
Expand Down Expand Up @@ -134,25 +138,25 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/README
+
+http://www.rabbitmq.com/documentation.html
\ No newline at end of file
diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/enabled_plugins
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/enabled_plugins
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/enabled_plugins Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/enabled_plugins Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,1 @@
+[rabbitmq_management].
\ No newline at end of file
diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/post_install.sh
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/post_install.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/post_install.sh Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/post_install.sh Wed Apr 18 14:43:07 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 9cbb98401fa9 pre-release/templates/rabbitmq-defaults
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/rabbitmq-defaults
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/rabbitmq-defaults Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/rabbitmq-defaults Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,34 @@
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
Expand Down Expand Up @@ -189,9 +193,9 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 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 9cbb98401fa9 pre-release/templates/rabbitmq-env
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/rabbitmq-env
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/rabbitmq-env Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/rabbitmq-env Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,51 @@
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
Expand Down Expand Up @@ -244,9 +248,9 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/rabbitmq-env
+
+## Get configuration variables from the configure environment file
+[ -f "${CONF_ENV_FILE}" ] && . "${CONF_ENV_FILE}"
diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/rabbitmq-server
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/rabbitmq-server
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/rabbitmq-server Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/rabbitmq-server Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,109 @@
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
Expand Down Expand Up @@ -357,9 +361,9 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/rabbitmq-server
+ ${RABBITMQ_SERVER_START_ARGS} \
+ "$@"
+
diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/rabbitmqctl
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/rabbitmqctl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/rabbitmqctl Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/rabbitmqctl Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,40 @@
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
Expand Down Expand Up @@ -401,9 +405,9 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/rabbitmqctl
+ -s rabbit_control \
+ -nodename $RABBITMQ_NODENAME \
+ -extra "$@"
diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/start_server
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/start_server
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/start_server Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/start_server Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,21 @@
+#!/bin/sh
+
Expand All @@ -427,9 +431,9 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/start_server
+
+exit 0
\ No newline at end of file
diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/stop_server
diff -r 60755ae0eee9 -r a4352bbdb6e7 pre-release/templates/stop_server
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pre-release/templates/stop_server Tue Apr 17 02:39:47 2012 +0200
+++ b/pre-release/templates/stop_server Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,24 @@
+#!/bin/sh
+EPMD_ROOT=./%%ERTS_VSN%%/bin
Expand All @@ -455,10 +459,10 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 pre-release/templates/stop_server
+done
+
+"${EPMD_ROOT}"/epmd -names | grep -q name || epmd -kill
diff -r 60755ae0eee9 -r 9cbb98401fa9 src/rabbit_release.erl
diff -r 60755ae0eee9 -r a4352bbdb6e7 src/rabbit_release.erl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/rabbit_release.erl Tue Apr 17 02:39:47 2012 +0200
@@ -0,0 +1,152 @@
+++ b/src/rabbit_release.erl Wed Apr 18 14:43:07 2012 +0200
@@ -0,0 +1,185 @@
+-module(rabbit_release).
+
+-export([start/0, stop/0]).
Expand Down Expand Up @@ -501,8 +505,18 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 src/rabbit_release.erl
+ %% Write it out to $RABBITMQ_PLUGINS_EXPAND_DIR/rabbit.rel
+ rabbit_file:write_file(RootName ++ ".rel", io_lib:format("~p.~n", [RDesc])),
+
+ XRefExclude = [mochiweb],
+
+ %% Compile the script
+ systools:make_script(RootName),
+ systools:make_script(RootName, [silent, {exref, AllApps -- XRefExclude}]),
+ ScriptFile = RootName ++ ".script",
+ case post_process_script(ScriptFile) of
+ ok -> ok;
+ {error, Reason} ->
+ terminate("post processing of boot script file ~s failed:~n~w",
+ [ScriptFile, Reason])
+ end,
+ systools:script2boot(RootName),
+ %% Make release tarfile
+ make_tar(RootName, RabbitHome),
+ terminate(0),
Expand Down Expand Up @@ -599,6 +613,29 @@ diff -r 60755ae0eee9 -r 9cbb98401fa9 src/rabbit_release.erl
+ expand_dependencies(sets:add_element(Next, Current), Rest ++ Unique)
+ end.
+
+post_process_script(ScriptFile) ->
+ case file:consult(ScriptFile) of
+ {ok, [{script, Name, Entries}]} ->
+ NewEntries = lists:flatmap(fun process_entry/1, Entries),
+ case file:open(ScriptFile, [write]) of
+ {ok, Fd} ->
+ io:format(Fd, "%% script generated at ~w ~w~n~p.~n",
+ [date(), time(), {script, Name, NewEntries}]),
+ file:close(Fd),
+ ok;
+ {error, OReason} ->
+ {error, {failed_to_open_script_file_for_writing, OReason}}
+ end;
+ {error, Reason} ->
+ {error, {failed_to_load_script, Reason}}
+ end.
+
+process_entry(Entry = {apply,{application,start_boot,[mnesia,permanent]}}) ->
+ [{apply,{rabbit,maybe_hipe_compile,[]}},
+ {apply,{rabbit,prepare,[]}}, Entry];
+process_entry(Entry) ->
+ [Entry].
+
+terminate(Fmt, Args) ->
+ io:format("ERROR: " ++ Fmt ++ "~n", Args),
+ terminate(?ERROR_CODE).
Expand Down

0 comments on commit faf7b5a

Please sign in to comment.