[vidalia-svn] r4038: WiX now bundles the .msi correctly. (in vidalia/branches/extension-api: pkg/win32 src/vidalia)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-08-13 21:02:10 -0400 (Thu, 13 Aug 2009)
New Revision: 4038

Modified:
   vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in
   vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
Log:
WiX now bundles the .msi correctly.

Modified: vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in
===================================================================
--- vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in	2009-08-13 23:23:56 UTC (rev 4037)
+++ vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in	2009-08-14 01:02:10 UTC (rev 4038)
@@ -72,8 +72,8 @@
             <Directory Id="MarblePlacemarkDataDir" Name="placemarks" />
             <Directory Id="MarbleStarsDataDir" Name="stars" />
             <Directory Id="MarbleSvgDataDir" Name="svg" />
-          </Directory>
           <?endif?>
+          </Directory>
         </Directory>
       </Directory>
     </Directory>
@@ -169,17 +169,14 @@
     <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" />
+              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" />
+              Name="libnetworkmapplugin.dll"
+              Source="@Vidalia_BINARY_DIR@\src\vidalia\NetworkMapPlugin\libnetworkmapplugin.dll" />
         <File Id="VidaliaMessagePlugin" DiskId="1"
-              NAME="libmessagelogplugin.dll"
-              Source="@Vidalia_BINARY_DIR@\src\vidalia\MessageLogPlugin\libmessa\
-gelogplugin.dll" />
+              Name="libmessagelogplugin.dll"
+              Source="@Vidalia_BINARY_DIR@\src\vidalia\MessageLogPlugin\libmessagelogplugin.dll" />
       </Component>
     </DirectoryRef>
 

Modified: vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/CMakeLists.txt	2009-08-13 23:23:56 UTC (rev 4037)
+++ vidalia/branches/extension-api/src/vidalia/CMakeLists.txt	2009-08-14 01:02:10 UTC (rev 4038)
@@ -452,3 +452,9 @@
   install(FILES res/128x128/tor-logo.png RENAME vidalia.png
           DESTINATION share/icons/hicolor/128x128/apps)
 endif(NOT WIN32 AND NOT APPLE)
+
+## Remember the location of the Vidalia binary so we can use it in
+## the Windows packaging scripts
+get_target_property(VIDALIA_EXECUTABLE ${vidalia_BIN} LOCATION_RelWithDebInfo)
+set(VIDALIA_EXECUTABLE ${VIDALIA_EXECUTABLE}
+    CACHE STRING "Location of the Vidalia executable." FORCE)
\ No newline at end of file