aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/win32/nsis
diff options
context:
space:
mode:
authorDave Cottlehuber <[email protected]>2011-03-18 23:45:32 +1300
committerPatrik Nyblom <[email protected]>2011-04-05 15:43:48 +0200
commitb76ad06f20a682c92354a4b7f7211bd1bf2b16b1 (patch)
treede7f5e73bddc3a28af30b22d231495e1257e69ff /erts/etc/win32/nsis
parente36547e3a192b40437be01d3323655b9d257cdd6 (diff)
downloadotp-b76ad06f20a682c92354a4b7f7211bd1bf2b16b1.tar.gz
otp-b76ad06f20a682c92354a4b7f7211bd1bf2b16b1.tar.bz2
otp-b76ad06f20a682c92354a4b7f7211bd1bf2b16b1.zip
support new SDKs in find_redist.sh and fallback to $ERL_TOP as last resort
find_redist.sh searches for the matching MS VC++ redistributable runtime in likely places. Patch adds support for MS Windows SDK 7.0 and 7.1, used in VS2008 and VS2010. Also supports putting vcredist_x86.exe in $ERL_TOP/.. or $ERL_TOP
Diffstat (limited to 'erts/etc/win32/nsis')
-rwxr-xr-xerts/etc/win32/nsis/find_redist.sh15
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