On Wed, Oct 21, 2015 at 7:55 PM, Christophe Fergeau <cfergeau@xxxxxxxxxx> wrote:
> On Tue, Oct 20, 2015 at 02:35:23PM +0300, Yedidyah Bar David wrote:
>> From: Christophe Fergeau <cfergeau@xxxxxxxxxx>
>>
>> Now that we are able to generate different installers for SPICE and
>> oVirt, we can install the oVirt agent when building an oVirt installer.
>>
>> Change-Id: I63e071262f8dd807cc1dd362e17fc814460c5254
>> Signed-off-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>
>> ---
>> win-guest-tools.nsis | 26 ++++++++++++++++++++++++++
>> 1 file changed, 26 insertions(+)
>>
>> diff --git a/win-guest-tools.nsis b/win-guest-tools.nsis
>> index 08e2b58..efd7392 100644
>> --- a/win-guest-tools.nsis
>> +++ b/win-guest-tools.nsis
>> @@ -94,6 +94,11 @@ Section "install"
>> SetOutPath "$INSTDIR"
>> File "version.txt"
>>
>> +!ifdef OVIRT
>> + File "bin/OVirtGuestService.exe"
>> + File "bin/ovirt-guest-agent.ini"
>> +!endif
>> +
>> SetOutPath "$INSTDIR\32"
>> File "bin/vdagent_x86/vdagent.exe"
>> File "bin/vdagent_x86/vdservice.exe"
>> @@ -166,6 +171,10 @@ Section "install"
>> Push "PCI\VEN_1AF4&DEV_1000&SUBSYS_00011AF4&REV_00"
>> Call InstallDriver
>>
>> +!ifdef OVIRT
>> + Call InstallOVirtAgentService
>> +!endif
>> +
>> Call InstallVdAgentService
>>
>> WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${REGKEYNAME}" \
>> @@ -205,8 +214,12 @@ Section "Uninstall"
>> Delete /rebootok "$INSTDIR\64\vdservice.exe"
>> RMDir /rebootok "$INSTDIR\64"
>> RMDir /rebootok /r "$INSTDIR\drivers"
>> +!ifdef OVIRT
>> + RMDir /rebootok "$INSTDIR\OVirtGuestService.exe"
>> +!endif
>> RMDir /rebootok "$INSTDIR"
>>
>> +
>> DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${REGKEYNAME}"
>> SectionEnd
>>
>> @@ -321,6 +334,10 @@ Function ${un}StopServices
>> push "BalloonService"
>> Call ${un}StopService
>>
>> +!ifdef OVIRT
>> + push "OVirtGuestService"
>> + Call ${un}StopService
>> +!endif
>>
>> FunctionEnd
>> !macroend
>> @@ -392,6 +409,15 @@ Function InstallVdAgentService
>>
>> FunctionEnd
>>
>> +Function InstallOVirtAgentService
>> + StrCpy $0 "$INSTDIR\OVirtGuestService.exe"
>> +
>> + push "OVirt Guest Service"
>> + push $0
>> + push "OVirtGuestService"
>> + Call InstallService
>> +FunctionEnd
>
> Looks like this should be surrounded by
> !ifdef OVIRT
> ....
> !endif
Again, this is part of your own patch, didn't touch it.
Not sure I agree. You already surround the call to it.
Isn't that enough? Anyway, whatever you feel like.
>
> I've squashed this locally
Not sure where :-)
>
> Christophe
--
Didi
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel