From 84adefa331c4159d432d22840663c38f155cd4c1 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 20 Nov 2009 14:54:40 +0000
Subject: The R13B03 release.

---
 erts/etc/win32/nsis/Makefile              |  88 ++++++
 erts/etc/win32/nsis/custom_modern.exe     | Bin 0 -> 6144 bytes
 erts/etc/win32/nsis/dll_version_helper.sh |  49 ++++
 erts/etc/win32/nsis/erlang.nsi            | 386 ++++++++++++++++++++++++++
 erts/etc/win32/nsis/erlang20.nsi          | 440 ++++++++++++++++++++++++++++++
 erts/etc/win32/nsis/erlang_inst.ico       | Bin 0 -> 766 bytes
 erts/etc/win32/nsis/erlang_uninst.ico     | Bin 0 -> 766 bytes
 erts/etc/win32/nsis/find_redist.sh        | 122 +++++++++
 8 files changed, 1085 insertions(+)
 create mode 100644 erts/etc/win32/nsis/Makefile
 create mode 100755 erts/etc/win32/nsis/custom_modern.exe
 create mode 100755 erts/etc/win32/nsis/dll_version_helper.sh
 create mode 100644 erts/etc/win32/nsis/erlang.nsi
 create mode 100644 erts/etc/win32/nsis/erlang20.nsi
 create mode 100644 erts/etc/win32/nsis/erlang_inst.ico
 create mode 100755 erts/etc/win32/nsis/erlang_uninst.ico
 create mode 100755 erts/etc/win32/nsis/find_redist.sh

(limited to 'erts/etc/win32/nsis')

diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile
new file mode 100644
index 0000000000..ebb3ad9a96
--- /dev/null
+++ b/erts/etc/win32/nsis/Makefile
@@ -0,0 +1,88 @@
+# 
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# 
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+# 
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+# 
+# %CopyrightEnd%
+# 
+
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+include $(ERL_TOP)/erts/vsn.mk
+
+VERSION_HEADER = erlang.nsh
+MAKENSIS = makensis
+MAKENSISFLAGS = /V2
+CUSTOM_MODERN=custom_modern.exe
+
+# This is not the way we usually do in our makefiles, 
+# but making release is the ONLY thing we do with this one,
+# Its not called during ordinary recursive make.
+all: release
+
+opt debug depend:
+	@echo Nothing to do for "'"$@"'" on $(TARGET)
+
+clean:
+	rm -f $(VERSION_HEADER)
+
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+TARGET_DIR = $(RELEASE_PATH)
+WTESTROOT=$(shell (cygpath -d $(RELEASE_PATH) 2>/dev/null || cygpath -w $(RELEASE_PATH)))
+WTARGET_DIR=$(shell (cygpath -d $(TARGET_DIR) 2>/dev/null || cygpath -d $(TARGET_DIR)))
+
+REDIST_FILE=$(shell (sh ./find_redist.sh || echo ""))
+REDIST_DLL_VERSION=$(shell (sh ./dll_version_helper.sh || echo ""))
+
+release_spec:
+	@NSIS_VER=`makensis /hdrinfo | head -1 | awk '{print $$2}'`; \
+	case $$NSIS_VER in \
+	v2.0b*) \
+	  echo '!define MUI_VERSION "$(SYSTEM_VSN)"' > $(VERSION_HEADER);\
+	  echo '!define ERTS_VERSION "$(VSN)"' >> $(VERSION_HEADER);\
+	  echo '!define TESTROOT "$(WTESTROOT)"' >> $(VERSION_HEADER);\
+	  echo '!define OUTFILEDIR "$(WTARGET_DIR)"' >> $(VERSION_HEADER);\
+	  if [ -f $(RELEASE_PATH)/docs/doc/index.html ];\
+	  then\
+		echo '!define HAVE_DOCS 1' >> $(VERSION_HEADER); \
+	  fi;\
+	  $(MAKENSIS) erlang.nsi;;\
+	v2.*) \
+	  echo '!define OTP_VERSION "$(SYSTEM_VSN)"' > $(VERSION_HEADER);\
+	  echo '!define ERTS_VERSION "$(VSN)"' >> $(VERSION_HEADER);\
+	  echo '!define TESTROOT "$(WTESTROOT)"' >> $(VERSION_HEADER);\
+	  echo '!define OUTFILEDIR "$(WTARGET_DIR)"' >> $(VERSION_HEADER);\
+	  if [ -f $(CUSTOM_MODERN) ];\
+	  then \
+		echo '!define HAVE_CUSTOM_MODERN 1' >> $(VERSION_HEADER); \
+	  fi;\
+	  if [ '!' -z "$(REDIST_FILE)" -a '!' -z "$(REDIST_DLL_VERSION)" ];\
+	  then \
+		cp $(REDIST_FILE) $(RELEASE_PATH)/vcredist_x86.exe;\
+		echo '!define HAVE_REDIST_FILE 1'  >> $(VERSION_HEADER); \
+		echo '!define REDIST_DLL_VERSION "$(REDIST_DLL_VERSION)"' >> $(VERSION_HEADER);\
+	  fi;\
+	  if [ -f $(RELEASE_PATH)/docs/doc/index.html ];\
+	  then \
+		echo '!define HAVE_DOCS 1' >> $(VERSION_HEADER); \
+	  fi;\
+	  echo "Running $(MAKENSIS) $(MAKENSISFLAGS) erlang20.nsi";\
+	  $(MAKENSIS) $(MAKENSISFLAGS) erlang20.nsi;;\
+	*) \
+	  echo 'Unsupported NSIS version';;\
+	esac	
+
+release_docs release_docs_spec docs:
+
diff --git a/erts/etc/win32/nsis/custom_modern.exe b/erts/etc/win32/nsis/custom_modern.exe
new file mode 100755
index 0000000000..0f56b8b239
Binary files /dev/null and b/erts/etc/win32/nsis/custom_modern.exe differ
diff --git a/erts/etc/win32/nsis/dll_version_helper.sh b/erts/etc/win32/nsis/dll_version_helper.sh
new file mode 100755
index 0000000000..e0047dea8b
--- /dev/null
+++ b/erts/etc/win32/nsis/dll_version_helper.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# 
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2007-2009. All Rights Reserved.
+# 
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+# 
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+# 
+# %CopyrightEnd%
+# 
+# This little helper digs out the current version of microsoft CRT
+# by compiling hello world and "parsing" the manifest file...
+
+# To debug using a fake version:
+
+# echo "8.0.50727.763"
+# exit 0
+
+cat > hello.c <<EOF
+#include <stdio.h>
+
+int main(void)
+{
+    printf("Hello world\n");
+    return 0;
+}
+
+EOF
+cl /MD hello.c > /dev/null 2>&1
+if [ '!' -f hello.exe.manifest ]; then
+    echo "This compiler does not generate manifest files - OK if using mingw" >&2
+    exit 0
+fi
+VERSION=`grep '<assemblyIdentity' hello.exe.manifest | sed 's,.*version=.\([0-9\.]*\).*,\1,g' | grep -v '<'`
+rm -f hello.c hello.obj hello.exe hello.exe.manifest
+if [ -z "$VERSION" ]; then
+    exit 1
+fi
+echo $VERSION
+exit 0
diff --git a/erts/etc/win32/nsis/erlang.nsi b/erts/etc/win32/nsis/erlang.nsi
new file mode 100644
index 0000000000..f4fd2b4cdb
--- /dev/null
+++ b/erts/etc/win32/nsis/erlang.nsi
@@ -0,0 +1,386 @@
+; NSIS Modern User Interface version 1.63
+; Erlang OTP installation script based on "Start Menu Folder Selection 
+; Example Script"
+; Original example written by Joost Verburg
+; Modified for Erlang by Patrik
+
+; Verbosity does not come naturally with MUI, have to set it back now and then.
+	!verbose 1
+	!define MUI_MANUALVERBOSE 1
+
+	!define MUI_PRODUCT "Erlang OTP"
+
+	!include "erlang.nsh" ; All release specific parameters come from this
+
+
+	!include "MUI.nsh"
+
+;--------------------------------
+;Configuration
+
+	;SetCompressor bzip2
+
+;General
+	OutFile "${OUTFILEDIR}\otp_win32_${MUI_VERSION}.exe"
+
+;Folder selection page
+  	InstallDir "$PROGRAMFILES\erl${ERTS_VERSION}"
+  
+;Remember install folder
+  	InstallDirRegKey HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}" ""
+  
+;$9 is being used to store the Start Menu Folder.
+;Do not use this variable in your script (or Push/Pop it)!
+
+;To change this variable, use MUI_STARTMENUPAGE_VARIABLE.
+;Have a look at the Readme for info about other options (default folder,
+;registry).
+
+; Set the default start menu folder
+
+	!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${MUI_PRODUCT} ${MUI_VERSION}"
+
+; Registry keys where start menu folder is stored
+  	!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
+  	!define MUI_STARTMENUPAGE_REGISTRY_KEY \
+		"SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}"
+  	!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+
+; Temporary variable used here and there...
+  	!define TEMP $R0
+  
+;--------------------------------
+;Modern UI Configuration
+  	!define MUI_ICON "erlang_inst.ico"
+  	!define MUI_UNICON "erlang_uninst.ico"
+	!define MUI_WELCOMEPAGE
+  	!define MUI_COMPONENTSPAGE
+  	!define MUI_DIRECTORYPAGE
+  	!define MUI_STARTMENUPAGE
+  
+  	!define MUI_ABORTWARNING
+  
+  	!define MUI_UNINSTALLER
+  	!define MUI_UNCONFIRMPAGE
+
+;--------------------------------
+;Languages
+ 
+  	!insertmacro MUI_LANGUAGE "English"
+  
+;--------------------------------
+;Language Strings
+
+;Description
+  	LangString DESC_SecErlang ${LANG_ENGLISH} "Erlang OTP."
+  	LangString DESC_SecErlangDev ${LANG_ENGLISH} \
+		"Erlang OTP development environment (required)."
+  	LangString DESC_SecErlangAssoc ${LANG_ENGLISH} \
+		"Erlang filetype associations (.erl, .hrl, .beam)."
+!ifdef HAVE_DOCS
+  	LangString DESC_SecErlangDoc ${LANG_ENGLISH} "Documentation."
+!endif
+;--------------------------------
+;Installer Sections
+
+SubSection /e "Erlang" SecErlang
+Section "Development" SecErlangDev
+SectionIn 1 RO
+
+  	StrCmp ${MUI_STARTMENUPAGE_VARIABLE} "" 0 skip_silent_mode
+	StrCpy ${MUI_STARTMENUPAGE_VARIABLE} \
+		"${MUI_STARTMENUPAGE_DEFAULTFOLDER}"
+skip_silent_mode:
+
+  	SetOutPath "$INSTDIR"
+  	File "${TESTROOT}\Install.ini"
+  	File "${TESTROOT}\Install.exe"
+  	File /r "${TESTROOT}\releases"
+  	File /r "${TESTROOT}\lib"
+  	File /r "${TESTROOT}\erts-${ERTS_VERSION}"
+  	File /r "${TESTROOT}\usr"
+  
+;Store install folder
+  	WriteRegStr HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}" "" $INSTDIR
+
+; Run the setup program  
+  	ExecWait '"$INSTDIR\Install.exe" -s'
+
+; The startmenu stuff
+  	!insertmacro MUI_STARTMENU_WRITE_BEGIN
+; Set back verbosity...
+  	!verbose 1
+; Try to use the Common startmenu...
+  	SetShellVarContext All
+  	ClearErrors
+  	CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}"
+  	IfErrors 0 continue_create
+    	;MessageBox MB_OK "Error creating file"
+    	SetShellVarContext current
+    	CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}"
+continue_create:
+  	WriteUninstaller "$INSTDIR\Uninstall.exe"
+  	CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Erlang.lnk" \
+		"$INSTDIR\bin\werl.exe"
+  	CreateShortCut \
+		"$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Uninstall.lnk" \
+		"$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 
+  
+  	!insertmacro MUI_STARTMENU_WRITE_END
+; And once again, the verbosity...
+  	!verbose 1
+;Create uninstaller
+;  	WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  	WriteRegStr HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})" \
+		"DisplayName" "Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})"
+  	WriteRegStr HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})" \
+		"UninstallString" "$INSTDIR\Uninstall.exe"
+  	WriteRegDWORD HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})" \
+		"NoModify" 1
+  	WriteRegDWORD HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})" \
+		"NoRepair" 1
+
+; Check that the registry could be written, we only check one key,
+; but it should be sufficient...
+  	ReadRegStr ${TEMP} "${MUI_STARTMENUPAGE_REGISTRY_ROOT}" \
+		"${MUI_STARTMENUPAGE_REGISTRY_KEY}" \
+		"${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
+
+  	StrCmp ${TEMP} "" 0 done
+
+; Now we're done if we are a superuser. If the registry stuff failed, we 
+; do the things below...
+
+  	WriteRegStr HKCU "Software\Ericsson\Erlang\${ERTS_VERSION}" \
+		"" $INSTDIR
+  	WriteRegStr HKCU "${MUI_STARTMENUPAGE_REGISTRY_KEY}" \
+		"${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}" \
+		"${MUI_STARTMENUPAGE_VARIABLE}"
+  	WriteRegStr HKCU \
+		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})" \
+		"DisplayName" "Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})"
+  	WriteRegStr HKCU \
+		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})" \
+		"UninstallString" "$INSTDIR\Uninstall.exe"
+  	WriteRegDWORD HKCU \
+		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})" \
+		"NoModify" 1
+  	WriteRegDWORD HKCU \
+		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})" \
+		"NoRepair" 1
+
+done:
+SectionEnd ; SecErlangDev
+
+Section "Associations" SecErlangAssoc
+
+  	;File /r "${TESTROOT}\usr\lib\icons"
+
+; .erl
+  	; back up old value of .erl
+  	ReadRegStr $1 HKCR ".erl" ""
+  	StrCmp $1 "" OwnErl
+    	StrCmp $1 "ErlangSource" OwnErl
+    	WriteRegStr HKCR ".erl" "backup_val" $1
+OwnErl:
+  	WriteRegStr HKCR ".erl" "" "ErlangSource"
+  	ReadRegStr $0 HKCR "ErlangSource" ""
+  	StrCmp $0 "" 0 skipErlAssoc
+	WriteRegStr HKCR "ErlangSource" "" "Erlang source file"
+	WriteRegStr HKCR "ErlangSource\shell" "" "open"
+	WriteRegStr HKCR "ErlangSource\shell\compile" "" "Compile"
+	WriteRegStr HKCR "ErlangSource\shell\compile\command" "" \
+		'"$INSTDIR\bin\erlc.exe" "%1"'
+	WriteRegStr HKCR "ErlangSource\DefaultIcon" "" \
+		$INSTDIR\usr\lib\icons\erl_icon.ico
+  	WriteRegStr HKCR "ErlangSource\shell\open\command" \
+		"" 'write.exe "%1"'
+skipErlAssoc:
+
+; .hrl
+  	; back up old value of .hrl
+  	ReadRegStr $1 HKCR ".hrl" ""
+  	StrCmp $1 "" OwnHrl
+    	StrCmp $1 "ErlangHeader" OwnHrl
+    	WriteRegStr HKCR ".hrl" "backup_val" $1
+OwnHrl:
+  	WriteRegStr HKCR ".hrl" "" "ErlangHeader"
+  	ReadRegStr $0 HKCR "ErlangHeader" ""
+  	StrCmp $0 "" 0 skipHrlAssoc
+	WriteRegStr HKCR "ErlangHeader" "" "Erlang header file"
+	WriteRegStr HKCR "ErlangHeader\shell" "" "open"
+	WriteRegStr HKCR "ErlangHeader\DefaultIcon" "" \
+		$INSTDIR\usr\lib\icons\hrl_icon.ico
+  	WriteRegStr HKCR "ErlangHeader\shell\open\command" \
+		"" 'write.exe "%1"'
+skipHrlAssoc:
+
+; .beam
+  	; back up old value of .beam
+  	ReadRegStr $1 HKCR ".beam" ""
+  	StrCmp $1 "" OwnBeam
+    	StrCmp $1 "ErlangBeam" OwnBeam
+    	WriteRegStr HKCR ".beam" "backup_val" $1
+OwnBeam:
+  	WriteRegStr HKCR ".beam" "" "ErlangBeam"
+  	ReadRegStr $0 HKCR "ErlangBeam" ""
+  	StrCmp $0 "" 0 skipBeamAssoc
+	WriteRegStr HKCR "ErlangBeam" "" "Erlang beam code"
+	WriteRegStr HKCR "ErlangBeam\DefaultIcon" "" \
+		$INSTDIR\usr\lib\icons\beam_icon.ico
+skipBeamAssoc:
+
+SectionEnd ; SecErlangAssoc
+SubSectionEnd
+
+!ifdef HAVE_DOCS
+Section "Erlang Documentation" SecErlangDoc
+
+  	SetOutPath "$INSTDIR"
+  	File /r "${TESTROOT}\docs\*"
+  
+; The startmenu stuff
+  	!insertmacro MUI_STARTMENU_WRITE_BEGIN
+; Set back verbosity...
+  	!verbose 1
+; Try to use the Common startmenu...
+  	SetShellVarContext All
+  	ClearErrors
+  	CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Erlang Documentation.lnk" \
+		"$INSTDIR\doc\index.html"
+  	IfErrors 0 continue_create
+    	;MessageBox MB_OK "Error creating file"
+    	SetShellVarContext current
+  	CreateShortCut \
+		"$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Erlang Documentation.lnk" \
+		"$INSTDIR\doc\index.html"
+continue_create:
+  
+  	!insertmacro MUI_STARTMENU_WRITE_END
+; And once again, the verbosity...
+  	!verbose 1
+SectionEnd ; ErlangDoc
+!endif
+
+
+;Display the Finish header
+;Insert this macro after the sections if you are not using a finish page
+	!insertmacro MUI_SECTIONS_FINISHHEADER
+
+;--------------------------------
+;Descriptions
+
+	!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecErlang} $(DESC_SecErlang)
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecErlangDev} $(DESC_SecErlangDev)
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecErlangAssoc} \
+		$(DESC_SecErlangAssoc)
+!ifdef HAVE_DOCS
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecErlangDoc} $(DESC_SecErlangDoc)
+!endif
+	!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
+ 
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+  	RMDir /r "$INSTDIR"  
+  
+;Remove shortcut
+  	ReadRegStr ${TEMP} "${MUI_STARTMENUPAGE_REGISTRY_ROOT}" \
+		"${MUI_STARTMENUPAGE_REGISTRY_KEY}" \
+		"${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
+	StrCmp ${TEMP} "" 0 end_try
+; Try HKCU instead...
+  	ReadRegStr ${TEMP} HKCU \
+		"${MUI_STARTMENUPAGE_REGISTRY_KEY}" \
+		"${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
+; If this failed to, we have no shortcuts (eh?)
+  	StrCmp ${TEMP} "" noshortcuts
+end_try:
+  	SetShellVarContext All
+  	ClearErrors
+; If we cannot find the shortcut, switch to current user context
+  	GetFileTime "$SMPROGRAMS\${TEMP}\Erlang.lnk" $R1 $R2
+  	IfErrors 0 continue_delete
+    	;MessageBox MB_OK "Error removing file"
+    	SetShellVarContext current
+continue_delete:
+  	Delete "$SMPROGRAMS\${TEMP}\Erlang.lnk"
+  	Delete "$SMPROGRAMS\${TEMP}\Uninstall.lnk"
+  	Delete "$SMPROGRAMS\${TEMP}\Erlang Documentation.lnk"
+  	RMDir "$SMPROGRAMS\${TEMP}" ;Only if empty
+
+noshortcuts:
+; We delete both in HKCU and HKLM, we don't really know were they might be...
+  	DeleteRegKey /ifempty HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}"
+  	DeleteRegKey /ifempty HKCU "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}"
+  	DeleteRegKey HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})"
+  	DeleteRegKey HKCU \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${MUI_VERSION} (${ERTS_VERSION})"
+
+
+; Now remove shell/file associations we'we made...
+; .erl
+  	ReadRegStr $1 HKCR ".erl" ""
+  	StrCmp $1 "ErlangSource" 0 NoOwnSourceExt 
+    	ReadRegStr $1 HKCR ".erl" "backup_val"
+    	StrCmp $1 "" 0 RestoreBackupSource 
+      	DeleteRegKey HKCR ".erl"
+    	Goto NoOwnSourceExt
+RestoreBackupSource:
+      	WriteRegStr HKCR ".erl" "" $1
+      	DeleteRegValue HKCR ".erl" "backup_val"
+NoOwnSourceExt:
+	
+  	ReadRegStr $1 HKCR "ErlangSource\DefaultIcon" ""
+	StrCmp $1 "$INSTDIR\usr\lib\icons\erl_icon.ico" 0 NoOwnSource 
+  	DeleteRegKey HKCR "ErlangSource"
+NoOwnSource:
+
+;.hrl
+  	ReadRegStr $1 HKCR ".hrl" ""
+  	StrCmp $1 "ErlangHeader" 0 NoOwnHeaderExt 
+    	ReadRegStr $1 HKCR ".hrl" "backup_val"
+    	StrCmp $1 "" 0 RestoreBackupHeader 
+      	DeleteRegKey HKCR ".hrl"
+    	Goto NoOwnHeaderExt
+RestoreBackupHeader:
+      	WriteRegStr HKCR ".hrl" "" $1
+      	DeleteRegValue HKCR ".hrl" "backup_val"
+NoOwnHeaderExt:
+	
+  	ReadRegStr $1 HKCR "ErlangHeader\DefaultIcon" ""
+	StrCmp $1 "$INSTDIR\usr\lib\icons\hrl_icon.ico" 0 NoOwnHeader 
+  	DeleteRegKey HKCR "ErlangHeader"
+NoOwnHeader:
+
+;.beam
+  	ReadRegStr $1 HKCR ".beam" ""
+  	StrCmp $1 "ErlangBeam" 0 NoOwnBeamExt 
+    	ReadRegStr $1 HKCR ".beam" "backup_val"
+    	StrCmp $1 "" 0 RestoreBackupBeam 
+      	DeleteRegKey HKCR ".beam"
+    	Goto NoOwnBeamExt
+RestoreBackupBeam:
+      	WriteRegStr HKCR ".beam" "" $1
+      	DeleteRegValue HKCR ".beam" "backup_val"
+NoOwnBeamExt:
+	
+  	ReadRegStr $1 HKCR "ErlangBeam\DefaultIcon" ""
+	StrCmp $1 "$INSTDIR\usr\lib\icons\beam_icon.ico" 0 NoOwnBeam 
+  	DeleteRegKey HKCR "ErlangBeam"
+NoOwnBeam:
+
+;Display the Finish header
+  	!insertmacro MUI_UNFINISHHEADER
+
+SectionEnd
+	!verbose 3
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi
new file mode 100644
index 0000000000..43e5d91604
--- /dev/null
+++ b/erts/etc/win32/nsis/erlang20.nsi
@@ -0,0 +1,440 @@
+; NSIS Modern User Interface version 1.63
+; Erlang OTP installation script based on "Start Menu Folder Selection 
+; Example Script"
+; Original example written by Joost Verburg
+; Modified for Erlang by Patrik
+
+; Verbosity does not come naturally with MUI, have to set it back now and then.
+	!verbose 1
+	!define MUI_MANUALVERBOSE 1
+
+	!define OTP_PRODUCT "Erlang OTP"
+
+	!include "erlang.nsh" ; All release specific parameters come from this
+
+	Name "${OTP_PRODUCT} ${OTP_VERSION}"
+
+	!include "MUI.nsh"
+	!include "WordFunc.nsh"
+;--------------------------------
+;Configuration
+
+	SetCompressor bzip2
+
+Var MYTEMP
+;Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+
+!define  MY_STARTMENUPAGE_REGISTRY_ROOT HKLM
+!define  MY_STARTMENUPAGE_REGISTRY_KEY "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}"
+!define MY_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+
+;General
+	OutFile "${OUTFILEDIR}\otp_win32_${OTP_VERSION}.exe"
+
+;Folder selection page
+  	InstallDir "$PROGRAMFILES\erl${ERTS_VERSION}"
+  
+;Remember install folder
+  	InstallDirRegKey HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}" ""
+  
+; Set the default start menu folder
+
+	!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_VERSION}"
+
+;--------------------------------
+;Modern UI Configuration
+!ifdef HAVE_CUSTOM_MODERN
+	!define MUI_UI "custom_modern.exe"
+!endif
+        !define MUI_ICON "erlang_inst.ico"
+        !define MUI_UNICON "erlang_uninst.ico"
+
+  	!insertmacro MUI_PAGE_COMPONENTS
+  	!insertmacro MUI_PAGE_DIRECTORY
+; Registry keys where start menu folder is stored
+
+  	!define MUI_STARTMENUPAGE_REGISTRY_ROOT ${MY_STARTMENUPAGE_REGISTRY_ROOT} 
+  	!define MUI_STARTMENUPAGE_REGISTRY_KEY "${MY_STARTMENUPAGE_REGISTRY_KEY}"
+  	!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${MY_STARTMENUPAGE_REGISTRY_VALUENAME}"
+
+        !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
+	!insertmacro MUI_PAGE_INSTFILES
+  
+        !insertmacro MUI_UNPAGE_CONFIRM
+        !insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+ 
+  	!insertmacro MUI_LANGUAGE "English"
+  
+;--------------------------------
+;Language Strings
+
+;Description
+  	LangString DESC_SecErlang ${LANG_ENGLISH} "Erlang OTP."
+  	LangString DESC_SecErlangDev ${LANG_ENGLISH} \
+		"Erlang OTP development environment (required)."
+  	LangString DESC_SecErlangAssoc ${LANG_ENGLISH} \
+		"Erlang filetype associations (.erl, .hrl, .beam)."
+!ifdef HAVE_DOCS
+  	LangString DESC_SecErlangDoc ${LANG_ENGLISH} "Documentation."
+!endif
+!ifdef HAVE_REDIST_FILE
+  	LangString DESC_SecMSRedist ${LANG_ENGLISH} "Microsoft redistributable C runtime libraries, these are mandatory for Erlang runtime and development. Always installed if not already present."
+!endif
+;--------------------------------
+; WordFunc
+!ifdef HAVE_REDIST_FILE
+	!insertmacro VersionCompare
+!endif
+;--------------------------------
+;Installer Sections
+
+!ifdef HAVE_REDIST_FILE
+Section "Microsoft redistributable libraries." SecMSRedist
+
+  	SetOutPath "$INSTDIR"
+	File "${TESTROOT}\vcredist_x86.exe"
+  
+; Set back verbosity...
+  	!verbose 1
+; Run the setup program  
+  	ExecWait '"$INSTDIR\vcredist_x86.exe"'
+
+  	!verbose 1
+SectionEnd ; MSRedist
+!endif
+
+SubSection /e "Erlang" SecErlang
+Section "Development" SecErlangDev
+SectionIn 1 RO
+
+  	SetOutPath "$INSTDIR"
+  	File "${TESTROOT}\Install.ini"
+  	File "${TESTROOT}\Install.exe"
+	SetOutPath "$INSTDIR\releases"
+  	File /r "${TESTROOT}\releases\"
+	SetOutPath "$INSTDIR\lib"
+  	File /r "${TESTROOT}\lib\"
+	SetOutPath "$INSTDIR\erts-${ERTS_VERSION}"
+  	File /r "${TESTROOT}\erts-${ERTS_VERSION}\"
+	SetOutPath "$INSTDIR\usr"
+  	File /r "${TESTROOT}\usr\"
+  
+;Store install folder
+  	WriteRegStr HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}" "" $INSTDIR
+
+; Run the setup program  
+  	Exec '"$INSTDIR\Install.exe" -s'
+
+; The startmenu stuff
+  	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+; Set back verbosity...
+  	!verbose 1
+; Try to use the Common startmenu...
+  	SetShellVarContext All
+  	ClearErrors
+  	CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+  	IfErrors 0 continue_create
+    	;MessageBox MB_OK "Error creating file"
+    	SetShellVarContext current
+    	CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+continue_create:
+  	CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Erlang.lnk" \
+		"$INSTDIR\bin\werl.exe"
+  
+  	!insertmacro MUI_STARTMENU_WRITE_END
+; And once again, the verbosity...
+  	!verbose 1
+; Check that the registry could be written, we only check one key,
+; but it should be sufficient...
+  	ReadRegStr $MYTEMP ${MY_STARTMENUPAGE_REGISTRY_ROOT}  "${MY_STARTMENUPAGE_REGISTRY_KEY}" "${MY_STARTMENUPAGE_REGISTRY_VALUENAME}"
+
+  	StrCmp $MYTEMP "" 0 done_startmenu
+
+; If startmenu was skipped, this might be unnecessary, but wont hurt...	
+  	WriteRegStr HKCU "Software\Ericsson\Erlang\${ERTS_VERSION}" \
+		"" $INSTDIR
+  	WriteRegStr HKCU "${MY_STARTMENUPAGE_REGISTRY_KEY}" \
+		"${MY_STARTMENUPAGE_REGISTRY_VALUENAME}" \
+		"$STARTMENU_FOLDER"
+
+
+done_startmenu:
+;Create uninstaller
+  	WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  	WriteRegStr HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+		"DisplayName" "Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})"
+  	WriteRegStr HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+		"UninstallString" "$INSTDIR\Uninstall.exe"
+  	WriteRegDWORD HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+		"NoModify" 1
+  	WriteRegDWORD HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+		"NoRepair" 1
+
+; Check that the registry could be written, we only check one key,
+; but it should be sufficient...
+  	ReadRegStr $MYTEMP HKLM \
+	"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+	"NoRepair"
+
+  	StrCmp $MYTEMP "" 0 done
+
+; Now we're done if we are a superuser. If the registry stuff failed, we 
+; do the things below...
+
+  	WriteRegStr HKCU \
+		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+		"DisplayName" "Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})"
+  	WriteRegStr HKCU \
+		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+		"UninstallString" "$INSTDIR\Uninstall.exe"
+  	WriteRegDWORD HKCU \
+		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+		"NoModify" 1
+  	WriteRegDWORD HKCU \
+		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})" \
+		"NoRepair" 1
+
+done:
+SectionEnd ; SecErlangDev
+
+Section "Associations" SecErlangAssoc
+
+  	;File /r "${TESTROOT}\usr\lib\icons"
+
+; .erl
+  	DeleteRegKey HKCR ".erl"
+  	DeleteRegKey HKCR "ErlangSource"
+  	WriteRegStr HKCR ".erl" "" "ErlangSource"
+	WriteRegStr HKCR "ErlangSource" "" "Erlang source file"
+	WriteRegStr HKCR "ErlangSource\shell\compile" "" "Compile"
+	WriteRegStr HKCR "ErlangSource\shell\compile\command" "" \
+		'"$INSTDIR\bin\erlc.exe" "%1"'
+	WriteRegStr HKCR "ErlangSource\DefaultIcon" "" \
+		$INSTDIR\usr\lib\icons\erl_icon.ico
+; .hrl
+  	DeleteRegKey HKCR ".hrl"
+  	DeleteRegKey HKCR "ErlangHeader"
+  	WriteRegStr HKCR ".hrl" "" "ErlangHeader"
+	WriteRegStr HKCR "ErlangHeader" "" "Erlang header file"
+	WriteRegStr HKCR "ErlangHeader\DefaultIcon" "" \
+		$INSTDIR\usr\lib\icons\hrl_icon.ico
+
+; .beam
+  	DeleteRegKey HKCR ".beam"
+  	DeleteRegKey HKCR "ErlangBeam"
+  	WriteRegStr HKCR ".beam" "" "ErlangBeam"
+	WriteRegStr HKCR "ErlangBeam" "" "Erlang beam code"
+	WriteRegStr HKCR "ErlangBeam\DefaultIcon" "" \
+		$INSTDIR\usr\lib\icons\beam_icon.ico
+
+
+	SearchPath $1 "write.exe"
+	StrCmp $1 "" writeNotFound
+	WriteRegStr HKCR "ErlangSource\shell" "" "Open"
+  	WriteRegStr HKCR "ErlangSource\shell\open\command" "" \
+		'"$1" "%1"'
+	WriteRegStr HKCR "ErlangHeader\shell" "" "Open"
+  	WriteRegStr HKCR "ErlangHeader\shell\open\command" "" \
+		'"$1" "%1"'
+
+
+writeNotFound:
+SectionEnd ; SecErlangAssoc
+SubSectionEnd
+
+!ifdef HAVE_DOCS
+Section "Erlang Documentation" SecErlangDoc
+
+  	SetOutPath "$INSTDIR"
+  	File /r "${TESTROOT}\docs\*"
+  
+; The startmenu stuff
+  	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+; Set back verbosity...
+  	!verbose 1
+; Try to use the Common startmenu...
+  	SetShellVarContext All
+  	ClearErrors
+  	CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Erlang Documentation.lnk" \
+		"$INSTDIR\doc\index.html"
+  	IfErrors 0 continue_create
+    	;MessageBox MB_OK "Error creating file"
+    	SetShellVarContext current
+  	CreateShortCut \
+		"$SMPROGRAMS\$STARTMENU_FOLDER\Erlang Documentation.lnk" \
+		"$INSTDIR\doc\index.html"
+continue_create:
+  
+  	!insertmacro MUI_STARTMENU_WRITE_END
+; And once again, the verbosity...
+  	!verbose 1
+SectionEnd ; ErlangDoc
+!endif
+
+!ifdef HAVE_REDIST_FILE
+Function DllVersionGoodEnough
+    IntCmp 0 $R0 normal0 normal0 negative0
+    normal0: 
+        IntOp $R2 $R0 >> 16
+	Goto continue0
+    negative0:
+	IntOp $R2 $R0 & 0x7FFF0000
+	IntOp $R2 $R2 >> 16
+	IntOp $R2 $R2 | 0x8000
+    continue0:		
+    IntOp $R3 $R0 & 0x0000FFFF
+    IntCmp 0 $R1 normal1 normal1 negative1
+    normal1: 
+        IntOp $R4 $R1 >> 16
+	Goto continue1
+    negative1:
+	IntOp $R4 $R1 & 0x7FFF0000
+	IntOp $R4 $R4 >> 16
+	IntOp $R4 $R4 | 0x8000
+    continue1:		
+    IntOp $R5 $R1 & 0x0000FFFF
+    StrCpy $2 "$R2.$R3.$R4.$R5"
+    ${VersionCompare} $2 ${REDIST_DLL_VERSION} $R0
+    Return
+FunctionEnd
+
+Function .onInit
+   SectionGetFlags 0 $MYTEMP 
+;   MessageBox MB_YESNO "Found $SYSDIR\msvcr80.dll" IDYES FoundLbl
+   IfFileExists $SYSDIR\msvcr80.dll MaybeFoundInSystemLbl
+   SearchSxsLbl:	
+        FindFirst $0 $1 $WINDIR\WinSxS\x86*
+        LoopLbl:
+	    StrCmp $1 "" NotFoundLbl
+	    IfFileExists $WINDIR\WinSxS\$1\msvcr80.dll MaybeFoundInSxsLbl
+	    FindNext $0 $1
+	    Goto LoopLbl
+        MaybeFoundInSxsLbl:
+	    GetDllVersion $WINDIR\WinSxS\$1\msvcr80.dll $R0 $R1
+	    Call DllVersionGoodEnough
+	    FindNext $0 $1
+	    IntCmp 2 $R0 LoopLbl
+	    Goto FoundLbl  
+   MaybeFoundInSystemLbl:
+	GetDllVersion $SYSDIR\msvcr80.dll $R0 $R1
+	Call DllVersionGoodEnough
+	IntCmp 2 $R0 SearchSxSLbl  
+   FoundLbl:
+	IntOp $MYTEMP $MYTEMP & 4294967294
+	SectionSetFlags 0 $MYTEMP
+	SectionSetText 0 "Microsoft DLL's (present)"
+	Return
+   NotFoundLbl:
+        IntOp $MYTEMP $MYTEMP | 16
+	SectionSetFlags 0 $MYTEMP
+	SectionSetText 0 "Microsoft DLL's (needed)"
+	Return
+FunctionEnd
+!endif
+
+
+;Display the Finish header
+;Insert this macro after the sections if you are not using a finish page
+;	!insertmacro MUI_SECTIONS_FINISHHEADER
+
+;--------------------------------
+;Descriptions
+
+	!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecErlang} $(DESC_SecErlang)
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecErlangDev} $(DESC_SecErlangDev)
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecErlangAssoc} \
+		$(DESC_SecErlangAssoc)
+!ifdef HAVE_DOCS
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecErlangDoc} $(DESC_SecErlangDoc)
+!endif
+!ifdef HAVE_REDIST_FILE
+  	!insertmacro MUI_DESCRIPTION_TEXT ${SecMSRedist} $(DESC_SecMSRedist)
+!endif
+	!insertmacro MUI_FUNCTION_DESCRIPTION_END
+ 
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+  	RMDir /r "$INSTDIR"  
+  
+;Remove shortcut
+  	ReadRegStr $MYTEMP "${MY_STARTMENUPAGE_REGISTRY_ROOT}" \
+		"${MY_STARTMENUPAGE_REGISTRY_KEY}" \
+		"${MY_STARTMENUPAGE_REGISTRY_VALUENAME}"
+	StrCmp $MYTEMP "" 0 end_try
+; Try HKCU instead...
+  	ReadRegStr $MYTEMP "${MY_STARTMENUPAGE_REGISTRY_ROOT}" \
+		"${MY_STARTMENUPAGE_REGISTRY_KEY}" \
+		"${MY_STARTMENUPAGE_REGISTRY_VALUENAME}"
+; If this failed to, we have no shortcuts (eh?)
+  	StrCmp $MYTEMP "" noshortcuts
+end_try:
+  	SetShellVarContext All
+  	ClearErrors
+; If we cannot find the shortcut, switch to current user context
+  	GetFileTime "$SMPROGRAMS\$MYTEMP\Erlang.lnk" $R1 $R2
+  	IfErrors 0 continue_delete
+    	;MessageBox MB_OK "Error removing file"
+    	SetShellVarContext current
+continue_delete:
+  	Delete "$SMPROGRAMS\$MYTEMP\Erlang.lnk"
+  	Delete "$SMPROGRAMS\$MYTEMP\Uninstall.lnk"
+  	Delete "$SMPROGRAMS\$MYTEMP\Erlang Documentation.lnk"
+  	RMDir "$SMPROGRAMS\$MYTEMP" ;Only if empty
+
+noshortcuts:
+; We delete both in HKCU and HKLM, we don't really know were they might be...
+  	DeleteRegKey /ifempty HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}"
+  	DeleteRegKey /ifempty HKCU "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}"
+  	DeleteRegKey HKLM \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})"
+  	DeleteRegKey HKCU \
+		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})"
+
+
+; Now remove shell/file associations we'we made...
+; .erl
+  	ReadRegStr $1 HKCR ".erl" ""
+  	StrCmp $1 "ErlangSource" 0 NoOwnSource 
+  	ReadRegStr $1 HKCR "ErlangSource\DefaultIcon" ""
+	StrCmp $1 "$INSTDIR\usr\lib\icons\erl_icon.ico" 0 NoOwnSource 
+  	DeleteRegKey HKCR ".erl"
+  	DeleteRegKey HKCR "ErlangSource"
+NoOwnSource:
+; .hrl
+  	ReadRegStr $1 HKCR ".hrl" ""
+  	StrCmp $1 "ErlangHeader" 0 NoOwnHeader 
+  	ReadRegStr $1 HKCR "ErlangHeader\DefaultIcon" ""
+	StrCmp $1 "$INSTDIR\usr\lib\icons\hrl_icon.ico" 0 NoOwnHeader 
+  	DeleteRegKey HKCR ".hrl"
+  	DeleteRegKey HKCR "ErlangHeader"
+NoOwnHeader:
+
+; .beam
+  	ReadRegStr $1 HKCR ".beam" ""
+  	StrCmp $1 "ErlangBeam" 0 NoOwnBeam 
+  	ReadRegStr $1 HKCR "ErlangBeam\DefaultIcon" ""
+	StrCmp $1 "$INSTDIR\usr\lib\icons\beam_icon.ico" 0 NoOwnBeam 
+  	DeleteRegKey HKCR ".beam"
+  	DeleteRegKey HKCR "ErlangBeam"
+NoOwnBeam:
+
+;Display the Finish header
+;  	!insertmacro MUI_UNFINISHHEADER
+
+SectionEnd
+	!verbose 3
diff --git a/erts/etc/win32/nsis/erlang_inst.ico b/erts/etc/win32/nsis/erlang_inst.ico
new file mode 100644
index 0000000000..edbd8a6f2c
Binary files /dev/null and b/erts/etc/win32/nsis/erlang_inst.ico differ
diff --git a/erts/etc/win32/nsis/erlang_uninst.ico b/erts/etc/win32/nsis/erlang_uninst.ico
new file mode 100755
index 0000000000..edbd8a6f2c
Binary files /dev/null and b/erts/etc/win32/nsis/erlang_uninst.ico differ
diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh
new file mode 100755
index 0000000000..c5572839c5
--- /dev/null
+++ b/erts/etc/win32/nsis/find_redist.sh
@@ -0,0 +1,122 @@
+#! /bin/sh
+# 
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2007-2009. All Rights Reserved.
+# 
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+# 
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+# 
+# %CopyrightEnd%
+# 
+
+# first find some tool we know exists, i.e. cl.exe
+lookup_prog_in_path ()
+{
+    PROG=$1
+    save_ifs=$IFS
+    IFS=:
+    for p in $PATH; do
+	# In cygwin the programs are not always executable and have .exe suffix...
+	if [ "X$TARGET" = "Xwin32" ]; then
+	    if [ -f $p/$PROG.exe ]; then
+		echo $p/$PROG
+		break;
+	    fi
+	else
+	    if [ -x $p/$PROG ]; then
+		echo $p/$PROG
+		break;
+	    fi
+	fi
+    done
+    IFS=$save_ifs
+}
+
+remove_path_element()
+{
+    EL=$1
+    PA=$2
+    ACC=""
+    save_ifs=$IFS
+    IFS=/
+    set $PA
+    N=$#
+    while [ $N -gt 1 ]; do
+	if [ '!' -z "$1" ]; then
+	    ACC="${ACC}/$1"
+	fi
+	N=`expr $N - 1`
+	shift
+    done
+    UP=`echo $1 | tr [:lower:] [:upper:]`
+    ELUP=`echo $EL | tr [:lower:] [:upper:]`
+    IFS=$save_ifs
+    if [ "$UP" = "$ELUP" ]; then
+	echo "$ACC"
+    else
+	echo "${ACC}/$1"
+    fi
+
+    #echo "ACC=$ACC" >&2
+    #echo "1=$1" >&2
+}
+	
+add_path_element()
+{
+    EL=$1
+    PA=$2
+
+    ELUP=`echo $EL | tr [:lower:] [:upper:]`
+    #echo "PA=$PA" >&2
+    for x in ${PA}/*; do
+	#echo "X=$x" >&2
+	UP=`basename "$x" | tr [:lower:] [:upper:]`
+	#echo "UP=$UP" >&2
+	if [ "$UP" = "$ELUP" ]; then
+	    echo "$x"
+	    return 0;
+	fi
+    done
+    echo "$PA"
+}
+
+CLPATH=`lookup_prog_in_path cl`
+
+if [ -z "$CLPATH" ]; then 
+    echo "Can not locate cl.exe and vcredist_x86.exe - OK if using mingw" >&2
+    exit 1
+fi
+
+#echo $CLPATH
+BPATH=$CLPATH
+for x in cl bin vc; do
+    #echo $x
+    NBPATH=`remove_path_element $x "$BPATH"`
+    if [ "$NBPATH" = "$BPATH" ]; then
+	echo "Failed to locate vcredist_x86.exe because cl.exe was in an unexpected location" >&2
+	exit 2
+    fi
+    BPATH="$NBPATH"
+done
+#echo $BPATH
+for x in sdk v2.0 bootstrapper packages vcredist_x86 vcredist_x86.exe; do
+    #echo "x=$x"
+    #echo "BPATH=$BPATH"
+    NBPATH=`add_path_element $x "$BPATH"`
+    if [ "$NBPATH" = "$BPATH" ]; then
+	echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2
+	exit 3
+    fi
+    BPATH="$NBPATH"
+done
+echo $BPATH
+exit 0
\ No newline at end of file
-- 
cgit v1.2.3