From c5a67411ce1af7f12184ed3d645c794674cea8f9 Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Thu, 4 Nov 2010 17:53:21 +0100 Subject: Allow installer to take redistributables from VC9 --- erts/etc/win32/nsis/find_redist.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) mode change 100755 => 100644 erts/etc/win32/nsis/find_redist.sh (limited to 'erts/etc/win32/nsis/find_redist.sh') 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 From be63e483361c9a764f6a68df80e50fd7bd825e6b Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Fri, 5 Nov 2010 11:39:59 +0100 Subject: Correction of VS2008 redistributables location --- erts/etc/win32/nsis/find_redist.sh | 71 ++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 22 deletions(-) (limited to 'erts/etc/win32/nsis/find_redist.sh') diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh index de6ebc8e31..4211bd1dfc 100644 --- a/erts/etc/win32/nsis/find_redist.sh +++ b/erts/etc/win32/nsis/find_redist.sh @@ -107,29 +107,56 @@ for x in cl bin vc; do fi BPATH="$NBPATH" done -#echo $BPATH -STARTPATH=$BPATH -for verdir in v2.0 v3.5; do -BPATH=$STARTPATH +BPATH_LIST=$BPATH + +# rc.exe is in the Microsoft SDK directory of VS2008 +RCPATH=`lookup_prog_in_path rc` 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 - fail=true - break; +if [ '!' -z "$RCPATH" ]; then + BPATH=$RCPATH + for x in rc bin v6.0A ; do + NBPATH=`remove_path_element $x "$BPATH"` + if [ "$NBPATH" = "$BPATH" ]; then + fail=true + break; + fi + BPATH="$NBPATH" + done + if [ $fail = false ]; then + BPATH_LIST="$BPATH_LIST $BPATH" fi - BPATH="$NBPATH" -done -if [ $fail = false ]; then - break; fi + +# Frantic search through two roots with different +# version directories. We want to be very specific about the +# directory structures as we woildnt want to find the wrong +# redistributables... + +#echo $BPATH +for BP in $BPATH_LIST; do + for verdir in "sdk v2.0" "sdk v3.5" "v6.0A"; do + BPATH=$BP + fail=false + for x in $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 + fail=true + break; + fi + BPATH="$NBPATH" + done + if [ $fail = false ]; then + break; + fi + done + if [ $fail = false ]; then + echo $BPATH + exit 0 + 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 + +echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2 +exit 3 + -- cgit v1.2.3 From b9101fe19b7f8d659d266152b36cc436b90c77a3 Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Thu, 4 Nov 2010 17:55:55 +0100 Subject: Make Unicode filenames work on Windows --- erts/etc/win32/nsis/find_redist.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 erts/etc/win32/nsis/find_redist.sh (limited to 'erts/etc/win32/nsis/find_redist.sh') diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh old mode 100644 new mode 100755 index 4211bd1dfc..153977ded5 --- a/erts/etc/win32/nsis/find_redist.sh +++ b/erts/etc/win32/nsis/find_redist.sh @@ -2,7 +2,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2007-2009. All Rights Reserved. +# Copyright Ericsson AB 2007-2010. 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 -- cgit v1.2.3