From c5a67411ce1af7f12184ed3d645c794674cea8f9 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Thu, 4 Nov 2010 17:53:21 +0100
Subject: Allow installer to take redistributables from VC9

---
 erts/etc/win32/nsis/Makefile              |  2 ++
 erts/etc/win32/nsis/dll_version_helper.sh | 10 ++++++++--
 erts/etc/win32/nsis/erlang20.nsi          | 10 +++++-----
 erts/etc/win32/nsis/find_redist.sh        | 23 ++++++++++++++++++-----
 4 files changed, 33 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 erts/etc/win32/nsis/dll_version_helper.sh
 mode change 100755 => 100644 erts/etc/win32/nsis/find_redist.sh

diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile
index ebb3ad9a96..981a232c69 100644
--- a/erts/etc/win32/nsis/Makefile
+++ b/erts/etc/win32/nsis/Makefile
@@ -45,6 +45,7 @@ WTARGET_DIR=$(shell (cygpath -d $(TARGET_DIR) 2>/dev/null || cygpath -d $(TARGET
 
 REDIST_FILE=$(shell (sh ./find_redist.sh || echo ""))
 REDIST_DLL_VERSION=$(shell (sh ./dll_version_helper.sh || echo ""))
+REDIST_DLL_NAME=$(shell (sh ./dll_version_helper.sh -n || echo ""))
 
 release_spec:
 	@NSIS_VER=`makensis /hdrinfo | head -1 | awk '{print $$2}'`; \
@@ -73,6 +74,7 @@ release_spec:
 		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);\
+		echo '!define REDIST_DLL_NAME "$(REDIST_DLL_NAME)"' >> $(VERSION_HEADER);\
 	  fi;\
 	  if [ -f $(RELEASE_PATH)/docs/doc/index.html ];\
 	  then \
diff --git a/erts/etc/win32/nsis/dll_version_helper.sh b/erts/etc/win32/nsis/dll_version_helper.sh
old mode 100755
new mode 100644
index e0047dea8b..73a9183d68
--- a/erts/etc/win32/nsis/dll_version_helper.sh
+++ b/erts/etc/win32/nsis/dll_version_helper.sh
@@ -41,9 +41,15 @@ if [ '!' -f hello.exe.manifest ]; then
     exit 0
 fi
 VERSION=`grep '<assemblyIdentity' hello.exe.manifest | sed 's,.*version=.\([0-9\.]*\).*,\1,g' | grep -v '<'`
+NAME=`grep '<assemblyIdentity' hello.exe.manifest | sed 's,.*name=.[A-Za-z\.]*\([0-9]*\).*,msvcr\1.dll,g' | grep -v '<'`
 rm -f hello.c hello.obj hello.exe hello.exe.manifest
-if [ -z "$VERSION" ]; then
+if [ "$1" = "-n" ]; then
+    ASKEDFOR=$NAME
+else
+    ASKEDFOR=$VERSION
+fi
+if [ -z "$ASKEDFOR" ]; then
     exit 1
 fi
-echo $VERSION
+echo $ASKEDFOR
 exit 0
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi
index 43e5d91604..941e8e6f5d 100644
--- a/erts/etc/win32/nsis/erlang20.nsi
+++ b/erts/etc/win32/nsis/erlang20.nsi
@@ -311,23 +311,23 @@ FunctionEnd
 
 Function .onInit
    SectionGetFlags 0 $MYTEMP 
-;   MessageBox MB_YESNO "Found $SYSDIR\msvcr80.dll" IDYES FoundLbl
-   IfFileExists $SYSDIR\msvcr80.dll MaybeFoundInSystemLbl
+   ;MessageBox MB_YESNO "Found $SYSDIR\${REDIST_DLL_NAME}" IDYES FoundLbl
+   IfFileExists $SYSDIR\${REDIST_DLL_NAME} MaybeFoundInSystemLbl
    SearchSxsLbl:	
         FindFirst $0 $1 $WINDIR\WinSxS\x86*
         LoopLbl:
 	    StrCmp $1 "" NotFoundLbl
-	    IfFileExists $WINDIR\WinSxS\$1\msvcr80.dll MaybeFoundInSxsLbl
+	    IfFileExists $WINDIR\WinSxS\$1\${REDIST_DLL_NAME} MaybeFoundInSxsLbl
 	    FindNext $0 $1
 	    Goto LoopLbl
         MaybeFoundInSxsLbl:
-	    GetDllVersion $WINDIR\WinSxS\$1\msvcr80.dll $R0 $R1
+	    GetDllVersion $WINDIR\WinSxS\$1\${REDIST_DLL_NAME} $R0 $R1
 	    Call DllVersionGoodEnough
 	    FindNext $0 $1
 	    IntCmp 2 $R0 LoopLbl
 	    Goto FoundLbl  
    MaybeFoundInSystemLbl:
-	GetDllVersion $SYSDIR\msvcr80.dll $R0 $R1
+	GetDllVersion $SYSDIR\${REDIST_DLL_NAME} $R0 $R1
 	Call DllVersionGoodEnough
 	IntCmp 2 $R0 SearchSxSLbl  
    FoundLbl:
diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh
old mode 100755
new mode 100644
index c5572839c5..de6ebc8e31
--- a/erts/etc/win32/nsis/find_redist.sh
+++ b/erts/etc/win32/nsis/find_redist.sh
@@ -108,15 +108,28 @@ for x in cl bin vc; do
     BPATH="$NBPATH"
 done
 #echo $BPATH
-for x in sdk v2.0 bootstrapper packages vcredist_x86 vcredist_x86.exe; do
+STARTPATH=$BPATH
+for verdir in v2.0 v3.5; do
+BPATH=$STARTPATH
+fail=false
+for x in sdk $verdir 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
+	fail=true
+	break;
     fi
     BPATH="$NBPATH"
 done
-echo $BPATH
-exit 0
\ No newline at end of file
+if [ $fail = false ]; then
+    break;
+fi
+done
+if [ $fail = false ]; then
+    echo $BPATH
+    exit 0
+else
+    echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2
+    exit 3
+fi
-- 
cgit v1.2.3