diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-01-24 18:22:51 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-01-24 18:22:51 +0000 |
| commit | 2db8dbb786c663e8a55022660b533fff7969ecae (patch) | |
| tree | b438dfb745db368818d98d4483e2f8f17a82ad6d /packaging | |
| parent | e37e4ec481e8265802fe381779bd702164679082 (diff) | |
| download | rabbitmq-server-git-2db8dbb786c663e8a55022660b533fff7969ecae.tar.gz | |
Locate Erlang.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/windows-exe/Makefile | 2 | ||||
| -rw-r--r-- | packaging/windows-exe/rabbitmq_nsi.in | 41 |
2 files changed, 38 insertions, 5 deletions
diff --git a/packaging/windows-exe/Makefile b/packaging/windows-exe/Makefile index af46ec9c4f..eefa881aaa 100644 --- a/packaging/windows-exe/Makefile +++ b/packaging/windows-exe/Makefile @@ -15,4 +15,4 @@ rabbitmq_server-$(VERSION): unzip $(ZIP) clean: - rm -rf rabbitmq-*.nsi rabbitmq_server-* + rm -rf rabbitmq-*.nsi rabbitmq_server-* rabbitmq-server-*.exe diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in index fe634a467d..e888d5a263 100644 --- a/packaging/windows-exe/rabbitmq_nsi.in +++ b/packaging/windows-exe/rabbitmq_nsi.in @@ -1,5 +1,6 @@ ; Use the "Modern" UI !include MUI2.nsh +!include LogicLib.nsh ;-------------------------------- @@ -20,18 +21,18 @@ InstallDirRegKey HKLM "Software\RabbitMQ" "Install_Dir" RequestExecutionLevel admin ; Windows XP -TargetMinimalOS 5.1 +;TargetMinimalOS 5.1 ;-------------------------------- ; Pages - !insertmacro MUI_PAGE_LICENSE "..\..\LICENSE-MPL-RabbitMQ" +; !insertmacro MUI_PAGE_LICENSE "..\..\LICENSE-MPL-RabbitMQ" !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES - !insertmacro MUI_PAGE_FINISH +; !insertmacro MUI_PAGE_FINISH !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES @@ -47,7 +48,9 @@ Section "RabbitMQ (required)" ; Set output path to the installation directory. SetOutPath $INSTDIR - ; Put file there + Call findErlang + + ; Put files there File /r "rabbitmq_server-%%VERSION%%" ; Write the installation path into the registry @@ -82,3 +85,33 @@ Section "Uninstall" ;RMDir "$INSTDIR" SectionEnd + +;-------------------------------- + +; Functions + +Function findErlang + + StrCpy $0 0 + StrCpy $2 "not-found" + ${Do} + EnumRegKey $1 HKLM Software\Ericsson\Erlang $0 + ${If} $1 = "" + ${Break} + ${EndIf} + ${If} $1 <> "ErlSrv" + StrCpy $2 $1 + ${EndIf} + + IntOp $0 $0 + 1 + ${Loop} + + ${If} $2 = "not-found" + MessageBox MB_OK "Erlang could not be detected. Please install it." + Abort + ${Else} + ReadRegStr $0 HKLM "Software\Ericsson\Erlang\$2" "" + MessageBox MB_OK "Erlang is installed at: $0" + ${EndIf} + +FunctionEnd
\ No newline at end of file |