diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-24 21:34:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-24 21:34:22 +0200 |
| commit | 442b4225d3310599a8bc9107dc3f7b4153a286c4 (patch) | |
| tree | 518b9298185272fad43e5afbc8a7cde21dc867e8 /nsis | |
| parent | e66194a54e0303568e7db1cb8772e2709afd864c (diff) | |
| download | vim-442b4225d3310599a8bc9107dc3f7b4153a286c4.zip | |
Improve the MS-Windows installer.
Diffstat (limited to 'nsis')
| -rw-r--r-- | nsis/gvim.nsi | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 2dcd2b3c8..2e47c770c 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -27,12 +27,15 @@ # ----------- No configurable settings below this line ----------- !include UpgradeDLL.nsh # for VisVim.dll +!include LogicLib.nsh +!include x64.nsh Name "Vim ${VER_MAJOR}.${VER_MINOR}" OutFile gvim${VER_MAJOR}${VER_MINOR}.exe CRCCheck force SetCompressor lzma SetDatablockOptimize on +RequestExecutionLevel highest ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer." DirText "Choose a directory to install Vim (must end in 'vim')" @@ -290,13 +293,21 @@ Section "Add an Edit-with-Vim context menu entry" SetOutPath $0 ClearErrors SetOverwrite try - File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext.dll + ${If} ${RunningX64} + File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext64.dll + ${Else} + File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext.dll + ${EndIf} IfErrors 0 GvimExtDone # Can't copy gvimext.dll, create it under another name and rename it on # next reboot. GetTempFileName $3 $0 - File /oname=$3 ${VIMSRC}\GvimExt\gvimext.dll + ${If} ${RunningX64} + File /oname=$3 ${VIMSRC}\GvimExt\gvimext64.dll + ${Else} + File /oname=$3 ${VIMSRC}\GvimExt\gvimext.dll + ${EndIf} Rename /REBOOTOK $3 $0\gvimext.dll GvimExtDone: |