[vidalia-svn] r4037: Fixed up the WiX packaging some more. Now onto testing. (vidalia/branches/extension-api/pkg/win32)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-08-13 19:23:56 -0400 (Thu, 13 Aug 2009)
New Revision: 4037

Modified:
   vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in
Log:
Fixed up the WiX packaging some more. Now onto testing.

Modified: vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in
===================================================================
--- vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in	2009-08-13 22:59:29 UTC (rev 4036)
+++ vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in	2009-08-13 23:23:56 UTC (rev 4037)
@@ -8,6 +8,8 @@
   <?define VidaliaUpgradeCode="B7FBFE11-D7CA-4895-A1FB-1D7E065E4D04" ?>
   <?define VidaliaProductGuid="9CED970A-609E-445F-92E9-4953BA719AAB" ?>
   <?define VidaliaDocumentsGuid="C5D61CEA-E771-42C0-8927-2F8ACF1B5C81" ?>
+  <?define VidaliaLibrariesGuid="CF69C598-BFD6-4755-B6C3-5A9B29B1CBAC" ?>
+  <?define VidaliaPluginsGuid="C680E73B-D31F-45A9-934F-1B3C39624D6E" ?>
   <?define QtLibraryGuid="1CEE0A99-2D66-4751-AD8D-FF0DAEFCA884" ?>
   <?define QtImageFormatPluginsGuid="1F77ADF0-3A71-43FD-BB4F-0EE5BEF2D332" ?>
   <?define MinGWLibraryGuid="6F3AD487-30AC-41DA-8E66-709F9C338BEA" ?>
@@ -103,17 +105,12 @@
               Name="LICENSE-OPENSSL" Source="@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL" />
       </Component>
 
-      <!-- Vidalia default plugins -->
-      <Component Id="VidaliaPlugins" Guid="$(var.VidaliaPluginsGuid)">
-        <File Id="VidaliaHomePlugin" DiskId="1"
-              NAME="libhomeplugin.dll"
-              Source="@Vidalia_SOURCE_DIR@\src\vidalia\HomePlugin\libhomeplugin.dll" />
-        <File Id="VidaliaNetworkPlugin" DiskId="1"
-              NAME="libnetworkmapplugin.dll"
-              Source="@Vidalia_SOURCE_DIR@\src\vidalia\NetworkMapPlugin\libnetworkmapplugin.dll" />
-        <File Id="VidaliaMessagePlugin" DiskId="1"
-              NAME="libmessagelogplugin.dll"
-              Source="@Vidalia_SOURCE_DIR@\src\vidalia\MessageLogPlugin\libmessagelogplugin.dll" />
+      <!-- Vidalia libraries -->
+      <Component Id="VidaliaLibraries" Guid="$(var.VidaliaLibrariesGuid)">
+        <File Id="VidaliaPluginLibrary" DiskId="1"
+              Name="libvidaliaplugin.dll" Source="@Vidalia_BINARY_DIR@\src\plugins\libvidaliaplugin.dll" />
+        <File Id="VidaliaTorControlLibrary" DiskId="1"
+              Name="libtorcontrol.dll" Source="@Vidalia_BINARY_DIR@\src\torcontrol\libtorcontrol.dll" />
       </Component>
 
       <!-- Qt-related library files -->
@@ -168,6 +165,24 @@
       <?endif?>
     </DirectoryRef>
 
+    <!-- Default Vidalia Plugins -->
+    <DirectoryRef Id="PluginsDir">
+      <Component Id="VidaliaPlugins" Guid="$(var.VidaliaPluginsGuid)">
+        <File Id="VidaliaHomePlugin" DiskId="1"
+              NAME="libhomeplugin.dll"
+              Source="@Vidalia_BINARY_DIR@\src\vidalia\HomePlugin\libhomeplugin.\
+dll" />
+        <File Id="VidaliaNetworkPlugin" DiskId="1"
+              NAME="libnetworkmapplugin.dll"
+              Source="@Vidalia_BINARY_DIR@\src\vidalia\NetworkMapPlugin\libnetwo\
+rkmapplugin.dll" />
+        <File Id="VidaliaMessagePlugin" DiskId="1"
+              NAME="libmessagelogplugin.dll"
+              Source="@Vidalia_BINARY_DIR@\src\vidalia\MessageLogPlugin\libmessa\
+gelogplugin.dll" />
+      </Component>
+    </DirectoryRef>
+
     <!-- Qt-related plugin files -->
     <?if $(var.UseMarble) = "ON"?>
       <DirectoryRef Id="QtImageFormatPluginsDir">
@@ -329,6 +344,8 @@
                Description="Main application">
         <ComponentRef Id="VidaliaExecutable" />
         <ComponentRef Id="VidaliaDocuments" />
+        <ComponentRef Id="VidaliaLibraries" />
+        <ComponentRef Id="VidaliaPlugins" />
         <ComponentRef Id="QtLibrary" />
         <ComponentRef Id="OpenSSLLibrary" />
         <?if $(var.UseMarble) = "ON"?>