diff options
| author | Patrik Nyblom <[email protected]> | 2010-11-04 17:53:21 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-11-30 16:30:47 +0100 |
| commit | c5a67411ce1af7f12184ed3d645c794674cea8f9 (patch) | |
| tree | c1d8f75fb2ee707e22161d5aae0ca77a429542d2 /erts/etc/win32/nsis/dll_version_helper.sh | |
| parent | 63eeba2f6829aac2644eaf212ebef9cdf4b59e8d (diff) | |
| download | otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.tar.gz otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.tar.bz2 otp-c5a67411ce1af7f12184ed3d645c794674cea8f9.zip | |
Allow installer to take redistributables from VC9
Diffstat (limited to 'erts/etc/win32/nsis/dll_version_helper.sh')
| -rw-r--r--[-rwxr-xr-x] | erts/etc/win32/nsis/dll_version_helper.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/erts/etc/win32/nsis/dll_version_helper.sh b/erts/etc/win32/nsis/dll_version_helper.sh index e0047dea8b..73a9183d68 100755..100644 --- 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 |