Changeset 684

Timestamp:

18/08/08 16:18:27 (5 months ago)

Author:

ono

Message:

Don't override server.pem on upgrade.

Location:

trunk/win32/setup

Files:

• ca/ca.c (modified) (1 diff)
• services.wxs (modified) (2 diffs)

trunk/win32/setup/ca/ca.c

@@ -26 +26 @@
         {"s2s.xml",                             "S2S.XML.EXISTS"},
         {"sm.xml",                              "SM.XML.EXISTS"},
+        {"server.pem",                  "SERVER.PEM.EXISTS"},
         {"sqlite.db",                   "SQLITE.DB.EXISTS"},
         {NULL, NULL}

trunk/win32/setup/services.wxs

@@ -101 +101 @@
                         </Component>
 
+                        <Component Id="sm.dist.xml" Guid="{B397D554-041C-4142-B4B0-7DB105001DE1}">
+                                <Condition>SERVER.PEM.EXISTS</Condition>
+                                <File Id="server.dist.pem" Name="server.dist.pem" Vital="yes" Source="$(var.TargetDir)\server.pem" />
+                        </Component>
                         <Component Id="server.pem" Guid="{8AA5D8A8-A7EC-4F9F-BD19-FE0DD03BA620}">
+                                <Condition>NOT SERVER.PEM.EXISTS</Condition>
                                 <File Id="server.pem" Name="server.pem" KeyPath="yes" Vital="yes" />
                         </Component>
+
                         <Component Id="jabberd2.dll" Guid="{4C6C8EBD-DB23-498C-8E1E-0254631AB252}">
                                 <File Id="jabberd2.dll" Name="jabberd2.dll" KeyPath="yes" Vital="yes" />
@@ -148 +154 @@
                         <ComponentRef Id="sm.dist.xml" />
                         <ComponentRef Id="server.pem" />
+                        <ComponentRef Id="server.dist.pem" />
                         <ComponentRef Id="jabberd2.dll" />
                         <ComponentRef Id="dbsetup.mysql" />