[Pkg-owncloud-commits] [owncloud-client] 121/175: NSIS: depend on nsProcess instead of Processes NSIS plugin

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit e1a36b53dc4646118cc2bc30b368c7f8a7ca264c
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Fri Mar 13 14:04:16 2015 +0100

    NSIS: depend on nsProcess instead of Processes NSIS plugin
    
    The Processes plugin is no longer maintained, and OBS
    compiles an up-to-date version of nsProcess for us.
---
 cmake/modules/NSIS.template.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 0f33386..1a776a7 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -97,6 +97,7 @@ 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
 
@@ -261,7 +262,7 @@ FunctionEnd
 ##############################################################################
 
 !macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
-   Processes::FindProcess ${processName}
+   ${nsProcess::FindProcess} ${processName} $R0
    StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
 !macroend
 
@@ -271,7 +272,7 @@ FunctionEnd
      /SD IDYES IDYES process_${processName}_kill IDNO process_${processName}_ended
    process_${processName}_kill:
       DetailPrint $ConfirmEndProcess_KILLING_PROCESSES_TEXT
-      Processes::KillProcess ${processName}
+      ${nsProcess::KillProcess} ${processName} $R0
       Sleep 1500
       StrCmp $R0 "1" process_${processName}_ended
       DetailPrint $ConfirmEndProcess_KILL_NOT_FOUND_TEXT

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git