diff options
| author | Erlang/OTP <[email protected]> | 2013-01-07 12:00:33 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-01-07 12:00:33 +0100 |
| commit | 47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5 (patch) | |
| tree | e488f7753c3a343fa57ab0a21f606d0e3dda23e3 /erts/etc/win32/nsis/dll_version_helper.sh | |
| parent | 3c05d3389f8b45e5b9f13a874de53ec521981a41 (diff) | |
| parent | 014f575ad684a2cf78925b839634ae6f90bb02e2 (diff) | |
| download | otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.tar.gz otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.tar.bz2 otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.zip | |
Merge branch 'fredrik/ssh/appup-r15b03-patch' into maint-r15
* fredrik/ssh/appup-r15b03-patch:
Fixed syntax appup ssh
Teach Win installer to handle redist on w2012/w8
Diffstat (limited to 'erts/etc/win32/nsis/dll_version_helper.sh')
| -rwxr-xr-x | erts/etc/win32/nsis/dll_version_helper.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/erts/etc/win32/nsis/dll_version_helper.sh b/erts/etc/win32/nsis/dll_version_helper.sh index 96e4532b7a..0d9ba4248d 100755 --- a/erts/etc/win32/nsis/dll_version_helper.sh +++ b/erts/etc/win32/nsis/dll_version_helper.sh @@ -25,6 +25,13 @@ # echo "8.0.50727.763" # exit 0 +if [ "$1" = "-n" ]; then + SWITCH=$1 + shift +else + SWITCH="" +fi + cat > hello.c <<EOF #include <windows.h> #include <stdio.h> @@ -42,11 +49,16 @@ if [ '!' -f hello.exe.manifest ]; then # need another way of getting the version DLLNAME=`dumpbin.exe -imports hello.exe | egrep MSVCR.*dll` DLLNAME=`echo $DLLNAME` + if [ '!' -z "$1" ]; then + FILETOLOOKIN=$1 + else + FILETOLOOKIN=$DLLNAME + fi cat > helper.c <<EOF #include <windows.h> #include <stdio.h> -#define REQ_MODULE "$DLLNAME" +#define REQ_MODULE "$FILETOLOOKIN" int main(void) { @@ -100,7 +112,7 @@ else NAME=`grep '<assemblyIdentity' hello.exe.manifest | sed 's,.*name=.[A-Za-z\.]*\([0-9]*\).*,msvcr\1.dll,g' | grep -v '<'` fi #rm -f hello.c hello.obj hello.exe hello.exe.manifest helper.c helper.obj helper.exe helper.exe.manifest -if [ "$1" = "-n" ]; then +if [ "$SWITCH" = "-n" ]; then ASKEDFOR=$NAME else ASKEDFOR=$VERSION |