diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2015-06-05 10:17:46 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2015-06-05 10:17:46 +0300 |
| commit | f9659d80c9a177b5a117dadb3393598e3b15a67f (patch) | |
| tree | 87a2507c98de95238af117fe7cdfcc0e9509c4bc /cmake/modules/NSIS.template.in | |
| parent | 553e8311218818ffb62e2faec8bee979fa1fa63c (diff) | |
Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin"
This reverts commit e1a36b53dc4646118cc2bc30b368c7f8a7ca264c.
Diffstat (limited to 'cmake/modules/NSIS.template.in')
| -rw-r--r-- | cmake/modules/NSIS.template.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 1a776a702..0f333869f 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -97,7 +97,6 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !include WordFunc.nsh ;Used by VersionCompare macro function. !include FileFunc.nsh ;Used to read out parameters !include UAC.nsh ;Used by the UAC elevation to install as user or admin. -!include nsProcess.nsh ;Used to kill the running process !include Library.nsh ;Used by the COM registration for shell extensions !include x64.nsh ;Used to determine the right arch for the shell extensions @@ -262,7 +261,7 @@ FunctionEnd ############################################################################## !macro CheckForProcess processName gotoWhenFound gotoWhenNotFound - ${nsProcess::FindProcess} ${processName} $R0 + Processes::FindProcess ${processName} StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound} !macroend @@ -272,7 +271,7 @@ FunctionEnd /SD IDYES IDYES process_${processName}_kill IDNO process_${processName}_ended process_${processName}_kill: DetailPrint $ConfirmEndProcess_KILLING_PROCESSES_TEXT - ${nsProcess::KillProcess} ${processName} $R0 + Processes::KillProcess ${processName} Sleep 1500 StrCmp $R0 "1" process_${processName}_ended DetailPrint $ConfirmEndProcess_KILL_NOT_FOUND_TEXT |