diff options
| author | Patrik Nyblom <[email protected]> | 2011-06-14 15:34:02 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:21:10 +0100 |
| commit | 42da126259f2b9d34e2591e798bcac893cbb145d (patch) | |
| tree | 32a0b47cd9503d990cf087d6b83708764680db68 /erts/etc/win32/nsis/erlang20.nsi | |
| parent | f2fce18b897189a60c518017704bf3b100451a93 (diff) | |
| download | otp-42da126259f2b9d34e2591e798bcac893cbb145d.tar.gz otp-42da126259f2b9d34e2591e798bcac893cbb145d.tar.bz2 otp-42da126259f2b9d34e2591e798bcac893cbb145d.zip | |
Make whole of OTP build and release on Win64
Removed symbolic links from repository.
Diffstat (limited to 'erts/etc/win32/nsis/erlang20.nsi')
| -rw-r--r-- | erts/etc/win32/nsis/erlang20.nsi | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi index 941e8e6f5d..fb0eff3867 100644 --- a/erts/etc/win32/nsis/erlang20.nsi +++ b/erts/etc/win32/nsis/erlang20.nsi @@ -31,17 +31,24 @@ Var STARTMENU_FOLDER !define MY_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
;General
- OutFile "${OUTFILEDIR}\otp_win32_${OTP_VERSION}.exe"
+ OutFile "${OUTFILEDIR}\otp_${WINTYPE}_${OTP_VERSION}.exe"
;Folder selection page
+!if ${WINTYPE} == "win64"
+ InstallDir "$PROGRAMFILES64\erl${ERTS_VERSION}"
+!else
InstallDir "$PROGRAMFILES\erl${ERTS_VERSION}"
-
+!endif
;Remember install folder
InstallDirRegKey HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}" ""
; Set the default start menu folder
+!if ${WINTYPE} == "win64"
+ !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_VERSION} (x64)"
+!else
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_VERSION}"
+!endif
;--------------------------------
;Modern UI Configuration
@@ -98,12 +105,12 @@ Var STARTMENU_FOLDER Section "Microsoft redistributable libraries." SecMSRedist
SetOutPath "$INSTDIR"
- File "${TESTROOT}\vcredist_x86.exe"
+ File "${TESTROOT}\${REDIST_EXECUTABLE}"
; Set back verbosity...
!verbose 1
; Run the setup program
- ExecWait '"$INSTDIR\vcredist_x86.exe"'
+ ExecWait '"$INSTDIR\${REDIST_EXECUTABLE}"'
!verbose 1
SectionEnd ; MSRedist
|