[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] qga-win: Add qga-serial-listener to msi install
From: |
Sameeh Jubran |
Subject: |
[Qemu-devel] [PATCH 4/5] qga-win: Add qga-serial-listener to msi installer |
Date: |
Wed, 5 Jul 2017 10:54:10 +0300 |
From: Sameeh Jubran <address@hidden>
Signed-off-by: Sameeh Jubran <address@hidden>
---
qga/installer/qemu-ga.wxs | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index fa2260c..40b7a7b 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -83,6 +83,9 @@
</ServiceInstall>
<ServiceControl Id="StartService" Start="install" Stop="both"
Remove="uninstall" Name="QEMU-GA" Wait="no" />
</Component>
+ <Component Id="qga_serial_listener"
Guid="{1B7B5172-4097-46E1-8A76-CCF2D31AE450}">
+ <File Id="qga_serial_listener.exe" Name="qga-serial-listener.exe"
Source="$(env.BUILD_DIR)/qga-serial-listener.exe" KeyPath="yes" DiskId="1"/>
+ </Component>
<?ifdef var.InstallVss?>
<Component Id="qga_vss_dll"
Guid="{CB19C453-FABB-4BB1-ABAB-6B74F687BFBB}">
<File Id="qga_vss.dll" Name="qga-vss.dll"
Source="$(env.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath="yes" DiskId="1"/>
@@ -139,6 +142,24 @@
<Property Id="cmd" Value="cmd.exe"/>
<Property Id="REINSTALLMODE" Value="amus"/>
+
+ <CustomAction Id="RegisterSerialListener"
+ ExeCommand='/c "[qemu_ga_directory]qemu-ga.exe" -s sl-install'
+ Execute="deferred"
+ Property="cmd"
+ Impersonate="no"
+ Return="check"
+ >
+ </CustomAction>
+ <CustomAction Id="UnRegisterSerialListener"
+ ExeCommand='/c "[qemu_ga_directory]qemu-ga.exe" -s sl-uninstall'
+ Execute="deferred"
+ Property="cmd"
+ Impersonate="no"
+ Return="check"
+ >
+ </CustomAction>
+
<?ifdef var.InstallVss?>
<CustomAction Id="RegisterCom"
ExeCommand='/c "[qemu_ga_directory]qemu-ga.exe" -s vss-install'
@@ -160,6 +181,7 @@
<Feature Id="QEMUFeature" Title="QEMU Guest Agent" Level="1">
<ComponentRef Id="qemu_ga" />
+ <ComponentRef Id="qga_serial_listener" />
<?ifdef var.InstallVss?>
<ComponentRef Id="qga_vss_dll" />
<ComponentRef Id="qga_vss_tlb" />
@@ -176,6 +198,8 @@
</Feature>
<InstallExecuteSequence>
+ <Custom Action="UnRegisterSerialListener"
After="StopServices">Installed</Custom>
+ <Custom Action="RegisterSerialListener" Before="InstallFinalize">NOT
REMOVE</Custom>
<?ifdef var.InstallVss?>
<Custom Action="UnRegisterCom" After="StopServices">Installed</Custom>
<Custom Action="RegisterCom" After="InstallServices">NOT REMOVE</Custom>
--
2.9.4
- [Qemu-devel] [PATCH 0/5] Fix qemu-ga's behaviour on Windows, Sameeh Jubran, 2017/07/05
- [Qemu-devel] [PATCH 2/5] qga-win: service-win32: Add start_service and stop_service functions, Sameeh Jubran, 2017/07/05
- [Qemu-devel] [PATCH 5/5] qga-win: service-win32: Use get_service function, Sameeh Jubran, 2017/07/05
- [Qemu-devel] [PATCH 4/5] qga-win: Add qga-serial-listener to msi installer,
Sameeh Jubran <=
- [Qemu-devel] [PATCH 3/5] qga-win: Add serial listener service, Sameeh Jubran, 2017/07/05
- Re: [Qemu-devel] [PATCH 0/5] Fix qemu-ga's behaviour on Windows, Sameeh Jubran, 2017/07/23