diff options
| author | Patrik Nyblom <[email protected]> | 2011-05-11 17:10:43 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-05-11 17:10:49 +0200 |
| commit | 5703c55ea47c52a8dc8475085a8657422da3535e (patch) | |
| tree | 5087ca98851c9424ec4a3c0a776ffac35c6eaf40 | |
| parent | 550b27993d040a412032703e69341cd9d7dc846c (diff) | |
| parent | b76ad06f20a682c92354a4b7f7211bd1bf2b16b1 (diff) | |
| download | otp-5703c55ea47c52a8dc8475085a8657422da3535e.tar.gz otp-5703c55ea47c52a8dc8475085a8657422da3535e.tar.bz2 otp-5703c55ea47c52a8dc8475085a8657422da3535e.zip | |
Merge branch 'dc/improved_find_redist' into dev
* dc/improved_find_redist:
support new SDKs in find_redist.sh and fallback to $ERL_TOP as last resort
OTP-9287
| -rwxr-xr-x | erts/etc/win32/nsis/find_redist.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh index 328811a0d7..bc4260ecba 100755 --- a/erts/etc/win32/nsis/find_redist.sh +++ b/erts/etc/win32/nsis/find_redist.sh @@ -139,8 +139,7 @@ fi #echo $BPATH_LIST for BP in $BPATH_LIST; do - #echo "BP=$BP" - for verdir in "sdk v2.0" "sdk v3.5" "v6.0A" "v7.0A" "v7.1"; do + for verdir in "sdk v2.0" "sdk v3.5" "v6.0A" "v7.0" "v7.0A" "v7.1"; do BPATH=$BP fail=false allow_fail=false @@ -171,6 +170,18 @@ for BP in $BPATH_LIST; do fi done +# shortcut for locating vcredist_x86.exe is to put it into $ERL_TOP +if [ -f $ERL_TOP/vcredist_x86.exe ]; then + echo $ERL_TOP/vcredist_x86.exe + exit 0 +fi + +# or $ERL_TOP/.. to share across multiple builds +if [ -f $ERL_TOP/../vcredist_x86.exe ]; then + echo $ERL_TOP/../vcredist_x86.exe + exit 0 +fi + echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2 exit 3 |