diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-31 13:25:42 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-31 13:25:42 +0100 |
| commit | fc53b92a0a00b4330366387ca61687e1e42256f9 (patch) | |
| tree | caca974dc2f003d9beb05dc7b640ca5edfea6cb7 /packaging | |
| parent | 63dcc9f6be8a3a76772fd6a24fcad36e9e48266d (diff) | |
| parent | b795aeb8dd38c59cdcf225f05a9b7dbd4eb4d76d (diff) | |
| download | rabbitmq-server-git-fc53b92a0a00b4330366387ca61687e1e42256f9.tar.gz | |
Merge bug26088
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/common/LICENSE.tail | 4 | ||||
| -rw-r--r-- | packaging/common/rabbitmq-script-wrapper | 2 | ||||
| -rwxr-xr-x | packaging/common/rabbitmq-server.ocf | 2 | ||||
| -rw-r--r-- | packaging/generic-unix/Makefile | 2 | ||||
| -rw-r--r-- | packaging/standalone/Makefile | 2 | ||||
| -rw-r--r-- | packaging/windows-exe/rabbitmq_nsi.in | 8 |
6 files changed, 13 insertions, 7 deletions
diff --git a/packaging/common/LICENSE.tail b/packaging/common/LICENSE.tail index 2dbaca0a9d..7858a04f15 100644 --- a/packaging/common/LICENSE.tail +++ b/packaging/common/LICENSE.tail @@ -56,7 +56,7 @@ The rest of this package is licensed under the Mozilla Public License 1.1 Authors and Copyright are as described below: The Initial Developer of the Original Code is GoPivotal, Inc. - Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved. + Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. MOZILLA PUBLIC LICENSE @@ -508,7 +508,7 @@ EXHIBIT A -Mozilla Public License. The Original Code is RabbitMQ. The Initial Developer of the Original Code is GoPivotal, Inc. - Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.'' + Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.'' [NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper index 7e5f77493f..55609e4138 100644 --- a/packaging/common/rabbitmq-script-wrapper +++ b/packaging/common/rabbitmq-script-wrapper @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved. +## Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. ## # Escape spaces and quotes, because shell is revolting. diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf index 6b3abf3ea3..c9279710ea 100755 --- a/packaging/common/rabbitmq-server.ocf +++ b/packaging/common/rabbitmq-server.ocf @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved. +## Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. ## ## diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile index 84a09a2a70..ddad8c09fa 100644 --- a/packaging/generic-unix/Makefile +++ b/packaging/generic-unix/Makefile @@ -10,7 +10,7 @@ dist: TARGET_DIR=`pwd`/$(TARGET_DIR) \ SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \ MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ - DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/etc \ + DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/etc/rabbitmq \ install sed -e 's:^SYS_PREFIX=$$:SYS_PREFIX=\$${RABBITMQ_HOME}:' \ diff --git a/packaging/standalone/Makefile b/packaging/standalone/Makefile index 3788da99af..dbb487ab19 100644 --- a/packaging/standalone/Makefile +++ b/packaging/standalone/Makefile @@ -24,7 +24,7 @@ dist: TARGET_DIR=`pwd`/$(TARGET_DIR) \ SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \ MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ - DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/etc \ + DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/etc/rabbitmq \ install ## Here we set the RABBITMQ_HOME variable, diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in index 85625a9d55..a8499d3dd2 100644 --- a/packaging/windows-exe/rabbitmq_nsi.in +++ b/packaging/windows-exe/rabbitmq_nsi.in @@ -37,7 +37,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "RabbitMQ Server" ;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "" VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "GoPivotal, Inc" ;VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "" ; TODO ? -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved." +VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved." VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "RabbitMQ Server" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "%%VERSION%%" @@ -76,6 +76,12 @@ Section "RabbitMQ Server (required)" Rabbit File /r "rabbitmq_server-%%VERSION%%" File "rabbitmq.ico" + ; Set output path to the user's data directory + SetOutPath $APPDATA\RabbitMQ + + ; ...And put the example config file there + File "rabbitmq_server-%%VERSION%%\etc\rabbitmq.config.example" + ; Write the installation path into the registry WriteRegStr HKLM "SOFTWARE\VMware, Inc.\RabbitMQ Server" "Install_Dir" "$INSTDIR" |