Changeset 682

Timestamp:

17/08/08 23:44:31 (4 months ago)

Author:

ono

Message:

Unfortunately we need to wait on services during setup or uninstallation / upgrades will fail.

Files:

• trunk/win32/setup/services.wxs (modified) (4 diffs)

trunk/win32/setup/services.wxs

@@ -12 +12 @@
                                         <ServiceDependency Id="jabberd2router" />
                                 </ServiceInstall>
-                                <ServiceControl Id="jabberd2c2s" Name="jabberd2c2s" Remove="uninstall" Start="install" Stop="both" Wait="no" />
+                                <ServiceControl Id="jabberd2c2s" Name="jabberd2c2s" Remove="uninstall" Start="install" Stop="both" Wait="yes" />
                         </Component>
                         <Component Id="c2s.dist.xml" Guid="{CFC12491-EB7B-4BFA-A0E1-4342A68DC481}">
@@ -32 +32 @@
                                                                 Id="jabberd2router" Name="jabberd2router" DisplayName="Jabber 2 Router"
                                                                 Description="Jabber Open Source Server: Router" />
-                                <ServiceControl Id="jabberd2router" Name="jabberd2router" Remove="uninstall" Start="install" Stop="both" Wait="no" />
+                                <ServiceControl Id="jabberd2router" Name="jabberd2router" Remove="uninstall" Start="install" Stop="both" Wait="yes" />
                         </Component>
                         <Component Id="router.dist.xml" Guid="{177EB263-58C5-4E48-AFA2-C4EEBF9C5726}">
@@ -68 +68 @@
                                         <ServiceDependency Id="jabberd2router" />
                                 </ServiceInstall>
-                                <ServiceControl Id="jabberd2s2s" Name="jabberd2s2s" Remove="uninstall" Start="install" Stop="both" Wait="no" />
+                                <ServiceControl Id="jabberd2s2s" Name="jabberd2s2s" Remove="uninstall" Start="install" Stop="both" Wait="yes" />
                         </Component>
                         <Component Id="s2s.dist.xml" Guid="{44A615A2-9452-4AD6-AFD6-7D52BE6E7EF5}">
@@ -88 +88 @@
                                         <ServiceDependency Id="jabberd2router" />
                                 </ServiceInstall>
-                                <ServiceControl Id="jabberd2sm" Name="jabberd2sm" Remove="uninstall" Start="install" Stop="both" Wait="no" />
+                                <ServiceControl Id="jabberd2sm" Name="jabberd2sm" Remove="uninstall" Start="install" Stop="both" Wait="yes" />
                         </Component>
                         <Component Id="sm.dist.xml" Guid="{7A694B6F-FB52-42B2-8D23-06E6C725E1D0}">