[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3630: <?if?> out the Marble-related components in the MSI installe (vidalia/trunk/pkg/win32)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r3630: <?if?> out the Marble-related components in the MSI installe (vidalia/trunk/pkg/win32)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Wed, 18 Mar 2009 23:00:11 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Wed, 18 Mar 2009 23:00:13 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2009-03-18 23:00:11 -0400 (Wed, 18 Mar 2009)
New Revision: 3630

Modified:
   vidalia/trunk/pkg/win32/vidalia.wxs.in
Log:

<?if?> out the Marble-related components in the MSI installer based
on the value of the USE_MARBLE cmake variable.


Modified: vidalia/trunk/pkg/win32/vidalia.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.wxs.in	2009-03-19 02:53:31 UTC (rev 3629)
+++ vidalia/trunk/pkg/win32/vidalia.wxs.in	2009-03-19 03:00:11 UTC (rev 3630)
@@ -22,6 +22,7 @@
   <?define MarblePlacemarkDataGuid="27D54547-A819-435b-9A0C-13284169A9D9" ?>
   <?define MarbleStarsDataGuid="8C5C3F32-67E6-4a4a-9B6C-6D67A6D44D67" ?>
   <?define MarbleSvgDataGuid="03E25BCA-4C58-4571-9F17-061D52877714" ?>
+  <?define UseMarble="@USE_MARBLE@"?>
 
   <Product Name="Vidalia @VERSION@" Id="$(var.VidaliaProductGuid)"
            Language="1033" Codepage="1252"
@@ -49,25 +50,27 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="ProgramFilesDir">
         <Directory Id="INSTALLDIR" Name="Vidalia">
-          <Directory Id="PluginsDir" Name="plugins">
-            <Directory Id="QtPluginsDir" Name="qt">
-              <Directory Id="QtImageFormatPluginsDir" Name="imageformats" />
+          <?if $(var.UseMarble) = "ON"?>
+            <Directory Id="PluginsDir" Name="plugins">
+              <Directory Id="QtPluginsDir" Name="qt">
+                <Directory Id="QtImageFormatPluginsDir" Name="imageformats" />
+              </Directory>
+              <Directory Id="MarblePluginsDir" Name="marble" />
             </Directory>
-            <Directory Id="MarblePluginsDir" Name="marble" />
-          </Directory>
-          <Directory Id="MarbleDataDir" Name="data">
-            <Directory Id="MarbleMapsDir" Name="maps">
-              <Directory Id="MarbleEarthMapsDir" Name="earth">
-                <Directory Id="MarbleBlueMarbleDataDir" Name="bluemarble" />
-                <Directory Id="MarbleCityLightsDataDir" Name="citylights" />
-                <Directory Id="MarbleSrtmDataDir" Name="srtm" />
+            <Directory Id="MarbleDataDir" Name="data">
+              <Directory Id="MarbleMapsDir" Name="maps">
+                <Directory Id="MarbleEarthMapsDir" Name="earth">
+                  <Directory Id="MarbleBlueMarbleDataDir" Name="bluemarble" />
+                  <Directory Id="MarbleCityLightsDataDir" Name="citylights" />
+                  <Directory Id="MarbleSrtmDataDir" Name="srtm" />
+                </Directory>
               </Directory>
+              <Directory Id="MarbleMwdbiiDir" Name="mwdbii" />
+              <Directory Id="MarblePlacemarkDataDir" Name="placemarks" />
+              <Directory Id="MarbleStarsDataDir" Name="stars" />
+              <Directory Id="MarbleSvgDataDir" Name="svg" />
             </Directory>
-            <Directory Id="MarbleMwdbiiDir" Name="mwdbii" />
-            <Directory Id="MarblePlacemarkDataDir" Name="placemarks" />
-            <Directory Id="MarbleStarsDataDir" Name="stars" />
-            <Directory Id="MarbleSvgDataDir" Name="svg" />
-          </Directory>
+          <?endif?>
         </Directory>
       </Directory>
     </Directory>
@@ -109,8 +112,10 @@
               Name="QtNetwork4.dll" Source="@QT_BINARY_DIR@\QtNetwork4.dll" />
         <File Id="QtXml4Dll" DiskId="1"
               Name="QtXml4.dll" Source="@QT_BINARY_DIR@\QtXml4.dll" />
-        <File Id="QtSvg4Dll" DiskId="1"
-              Name="QtSvg4.dll" Source="@QT_BINARY_DIR@\QtSvg4.dll" />
+        <?if $(var.UseMarble) = "ON"?>
+          <File Id="QtSvg4Dll" DiskId="1"
+                Name="QtSvg4.dll" Source="@QT_BINARY_DIR@\QtSvg4.dll" />
+        <?endif?>
       </Component>
 
       <!-- MinGW-related library files -->
@@ -125,124 +130,128 @@
               Name="ssleay32.dll" Source="@OPENSSL_BINARY_DIR@\ssleay32.dll" />
       </Component>
       
-      <!-- Marble-related library files -->
-      <Component Id="MarbleWidgetLibrary" Guid="$(var.MarbleWidgetLibraryGuid)">
-        <File Id="MarbleWidgetDll" DiskId="1"
-              Name="libmarblewidget.dll" Source="@MARBLEWIDGET_LIBRARY@" />
-      </Component>
+      <?ifdef $(var.UseMarble) = "ON"?>
+        <!-- Marble-related library files -->
+        <Component Id="MarbleWidgetLibrary" Guid="$(var.MarbleWidgetLibraryGuid)">
+          <File Id="MarbleWidgetDll" DiskId="1"
+                Name="libmarblewidget.dll" Source="@MARBLEWIDGET_LIBRARY@" />
+        </Component>
+      <?endif?>
     </DirectoryRef>
 
     <!-- Qt-related plugin files -->
-    <DirectoryRef Id="QtImageFormatPluginsDir">
-      <Component Id="QtImageFormatPlugins" Guid="$(var.QtImageFormatPluginsGuid)">
-        <File Id="QJpeg4Dll" DiskId="1"
-              Name="qjpeg4.dll" Source="@QT_PLUGINS_DIR@\imageformats\qjpeg4.dll" />
-      </Component>
-    </DirectoryRef>
+    <?if $(var.UseMarble) = "ON"?>
+      <DirectoryRef Id="QtImageFormatPluginsDir">
+        <Component Id="QtImageFormatPlugins" Guid="$(var.QtImageFormatPluginsGuid)">
+          <File Id="QJpeg4Dll" DiskId="1"
+                Name="qjpeg4.dll" Source="@QT_PLUGINS_DIR@\imageformats\qjpeg4.dll" />
+        </Component>
+      </DirectoryRef>
 
-    <!-- Marble-related plugin files -->
-    <DirectoryRef Id="MarblePluginsDir">
-      <Component Id="MarblePlugins" Guid="$(var.MarblePluginsGuid)">
-        <File Id="MarbleOverviewMapPlugin" DiskId="1"
-              Name="libMarbleOverviewMap.dll" Source="@MARBLE_OVERVIEWMAP_PLUGIN@" />
-        <File Id="MarbleStarsPlugin" DiskId="1"
-              Name="libMarbleStarsPlugin.dll" Source="@MARBLE_STARS_PLUGIN@" />
-      </Component>
-    </DirectoryRef>
-          
-    <!-- Marble-related data files -->
-    <DirectoryRef Id="MarbleDataDir">
-      <Component Id="MarbleLegendsData" Guid="$(var.MarbleLegendsDataGuid)">
-        <File Id="LandColorsLegend" DiskId="1"
-              Name="landcolors.leg" Source="@MARBLE_DATA_DIR@\landcolors.leg" />
-        <File Id="SeaColorsLegend" DiskId="1"
-              Name="seacolors.leg" Source="@MARBLE_DATA_DIR@\seacolors.leg" />
-      </Component>
-    </DirectoryRef>
-    <DirectoryRef Id="MarbleBlueMarbleDataDir">
-      <Component Id="MarbleBlueMarbleData" Guid="$(var.MarbleBlueMarbleDataGuid)">
-        <File Id="MarbleBlueMarbleDgml" DiskId="1"
-              Name="bluemarble.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\bluemarble\bluemarble.dgml" />
-      </Component>
-    </DirectoryRef>
-    <DirectoryRef Id="MarbleCityLightsDataDir">
-      <Component Id="MarbleCityLightsData" Guid="$(var.MarbleCityLightsDataGuid)">
-        <File Id="MarbleCityLightsDgml" DiskId="1"
-              Name="citylights.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\citylights\citylights.dgml" />
-      </Component>
-    </DirectoryRef>
-    <DirectoryRef Id="MarbleSrtmDataDir">
-      <Component Id="MarbleSrtmData" Guid="$(var.MarbleSrtmDataGuid)">
-        <File Id="MarbleSrtmDgml" DiskId="1"
-              Name="srtm.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\srtm\srtm.dgml" />
-        <File Id="MarbleSrtmJpg" DiskId="1"
-              Name="srtm.jpg" Source="@MARBLE_DATA_DIR@\maps\earth\srtm\srtm.jpg" />
-      </Component>
-    </DirectoryRef>
-    <DirectoryRef Id="MarbleMwdbiiDir">
-      <Component Id="MarbleMwdbiiData" Guid="$(var.MarbleMwdbiiDataGuid)">
-        <File Id="DatelinePnt" DiskId="1"
-              Name="DATELINE.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\DATELINE.PNT" />
-        <File Id="PAustPnt" DiskId="1"
-              Name="PAUST.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PAUST.PNT" />
-        <File Id="PBorderPnt" DiskId="1"
-              Name="PBORDER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PBORDER.PNT" />
-        <File Id="PCanProvPnt" DiskId="1"
-              Name="PCANPROV.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PCANPROV.PNT" />
-        <File Id="PCoastPnt" DiskId="1"
-              Name="PCOAST.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PCOAST.PNT" />
-        <File Id="PDiffBorderPnt" DiskId="1"
-              Name="PDIFFBORDER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PDIFFBORDER.PNT" />
-        <File Id="PGlacierPnt" DiskId="1"
-              Name="PGLACIER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PGLACIER.PNT" />
-        <File Id="PIslandPnt" DiskId="1"
-              Name="PISLAND.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PISLAND.PNT" />
-        <File Id="PLakePnt" DiskId="1"
-              Name="PLAKE.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PLAKE.PNT" />
-        <File Id="PLakeIslandPnt" DiskId="1"
-              Name="PLAKEISLAND.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PLAKEISLAND.PNT" />
-        <File Id="PMexicoPnt" DiskId="1"
-              Name="PMEXICO.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PMEXICO.PNT" />
-        <File Id="PUsa48DiffPnt" DiskId="1"
-              Name="PUSA48.DIFF.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PUSA48.DIFF.PNT" />
-        <File Id="PUsa48Pnt" DiskId="1"
-              Name="PUSA48.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PUSA48.PNT" />
-        <File Id="RiverPnt" DiskId="1"
-              Name="RIVER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\RIVER.PNT" />
-      </Component>
-    </DirectoryRef>
-    <DirectoryRef Id="MarblePlacemarkDataDir">
-      <Component Id="MarblePlacemarkData" Guid="$(var.MarblePlacemarkDataGuid)">
-        <File Id="BasePlacemarksCache" DiskId="1"
-              Name="baseplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\baseplacemarks.cache" />
-        <File Id="BoundaryPlacemarksCache" DiskId="1"
-              Name="boundaryplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\boundaryplacemarks.cache" />
-        <File Id="ElevPlacemarksCache" DiskId="1"
-              Name="elevplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\elevplacemarks.cache" />
-      </Component>
-    </DirectoryRef>
-    <DirectoryRef Id="MarbleStarsDataDir">
-      <Component Id="MarbleStarsData" Guid="$(var.MarbleStarsDataGuid)">
-        <File Id="StarsDat" DiskId="1"
-              Name="stars.dat" Source="@MARBLE_DATA_DIR@\stars\stars.dat" />
-      </Component>
-    </DirectoryRef>
-    <DirectoryRef Id="MarbleSvgDataDir">
-      <Component Id="MarbleSvgData" Guid="$(var.MarbleSvgDataGuid)">
-        <File Id="WorldMapSvg" DiskId="1"
-              Name="worldmap.svg" Source="@MARBLE_DATA_DIR@\svg\worldmap.svg" />
-      </Component>
-    </DirectoryRef>
-    <ComponentGroup Id="MarbleData">
-      <ComponentRef Id="MarbleLegendsData" />
-      <ComponentRef Id="MarbleBlueMarbleData" />
-      <ComponentRef Id="MarbleCityLightsData" />
-      <ComponentRef Id="MarbleSrtmData" />
-      <ComponentRef Id="MarbleMwdbiiData" />
-      <ComponentRef Id="MarblePlacemarkData" />
-      <ComponentRef Id="MarbleStarsData" />
-      <ComponentRef Id="MarbleSvgData" />
-    </ComponentGroup>
+      <!-- Marble-related plugin files -->
+      <DirectoryRef Id="MarblePluginsDir">
+        <Component Id="MarblePlugins" Guid="$(var.MarblePluginsGuid)">
+          <File Id="MarbleOverviewMapPlugin" DiskId="1"
+                Name="libMarbleOverviewMap.dll" Source="@MARBLE_OVERVIEWMAP_PLUGIN@" />
+          <File Id="MarbleStarsPlugin" DiskId="1"
+                Name="libMarbleStarsPlugin.dll" Source="@MARBLE_STARS_PLUGIN@" />
+        </Component>
+      </DirectoryRef>
+            
+      <!-- Marble-related data files -->
+      <DirectoryRef Id="MarbleDataDir">
+        <Component Id="MarbleLegendsData" Guid="$(var.MarbleLegendsDataGuid)">
+          <File Id="LandColorsLegend" DiskId="1"
+                Name="landcolors.leg" Source="@MARBLE_DATA_DIR@\landcolors.leg" />
+          <File Id="SeaColorsLegend" DiskId="1"
+                Name="seacolors.leg" Source="@MARBLE_DATA_DIR@\seacolors.leg" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="MarbleBlueMarbleDataDir">
+        <Component Id="MarbleBlueMarbleData" Guid="$(var.MarbleBlueMarbleDataGuid)">
+          <File Id="MarbleBlueMarbleDgml" DiskId="1"
+                Name="bluemarble.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\bluemarble\bluemarble.dgml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="MarbleCityLightsDataDir">
+        <Component Id="MarbleCityLightsData" Guid="$(var.MarbleCityLightsDataGuid)">
+          <File Id="MarbleCityLightsDgml" DiskId="1"
+                Name="citylights.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\citylights\citylights.dgml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="MarbleSrtmDataDir">
+        <Component Id="MarbleSrtmData" Guid="$(var.MarbleSrtmDataGuid)">
+          <File Id="MarbleSrtmDgml" DiskId="1"
+                Name="srtm.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\srtm\srtm.dgml" />
+          <File Id="MarbleSrtmJpg" DiskId="1"
+                Name="srtm.jpg" Source="@MARBLE_DATA_DIR@\maps\earth\srtm\srtm.jpg" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="MarbleMwdbiiDir">
+        <Component Id="MarbleMwdbiiData" Guid="$(var.MarbleMwdbiiDataGuid)">
+          <File Id="DatelinePnt" DiskId="1"
+                Name="DATELINE.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\DATELINE.PNT" />
+          <File Id="PAustPnt" DiskId="1"
+                Name="PAUST.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PAUST.PNT" />
+          <File Id="PBorderPnt" DiskId="1"
+                Name="PBORDER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PBORDER.PNT" />
+          <File Id="PCanProvPnt" DiskId="1"
+                Name="PCANPROV.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PCANPROV.PNT" />
+          <File Id="PCoastPnt" DiskId="1"
+                Name="PCOAST.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PCOAST.PNT" />
+          <File Id="PDiffBorderPnt" DiskId="1"
+                Name="PDIFFBORDER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PDIFFBORDER.PNT" />
+          <File Id="PGlacierPnt" DiskId="1"
+                Name="PGLACIER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PGLACIER.PNT" />
+          <File Id="PIslandPnt" DiskId="1"
+                Name="PISLAND.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PISLAND.PNT" />
+          <File Id="PLakePnt" DiskId="1"
+                Name="PLAKE.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PLAKE.PNT" />
+          <File Id="PLakeIslandPnt" DiskId="1"
+                Name="PLAKEISLAND.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PLAKEISLAND.PNT" />
+          <File Id="PMexicoPnt" DiskId="1"
+                Name="PMEXICO.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PMEXICO.PNT" />
+          <File Id="PUsa48DiffPnt" DiskId="1"
+                Name="PUSA48.DIFF.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PUSA48.DIFF.PNT" />
+          <File Id="PUsa48Pnt" DiskId="1"
+                Name="PUSA48.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PUSA48.PNT" />
+          <File Id="RiverPnt" DiskId="1"
+                Name="RIVER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\RIVER.PNT" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="MarblePlacemarkDataDir">
+        <Component Id="MarblePlacemarkData" Guid="$(var.MarblePlacemarkDataGuid)">
+          <File Id="BasePlacemarksCache" DiskId="1"
+                Name="baseplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\baseplacemarks.cache" />
+          <File Id="BoundaryPlacemarksCache" DiskId="1"
+                Name="boundaryplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\boundaryplacemarks.cache" />
+          <File Id="ElevPlacemarksCache" DiskId="1"
+                Name="elevplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\elevplacemarks.cache" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="MarbleStarsDataDir">
+        <Component Id="MarbleStarsData" Guid="$(var.MarbleStarsDataGuid)">
+          <File Id="StarsDat" DiskId="1"
+                Name="stars.dat" Source="@MARBLE_DATA_DIR@\stars\stars.dat" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="MarbleSvgDataDir">
+        <Component Id="MarbleSvgData" Guid="$(var.MarbleSvgDataGuid)">
+          <File Id="WorldMapSvg" DiskId="1"
+                Name="worldmap.svg" Source="@MARBLE_DATA_DIR@\svg\worldmap.svg" />
+        </Component>
+      </DirectoryRef>
+      <ComponentGroup Id="MarbleData">
+        <ComponentRef Id="MarbleLegendsData" />
+        <ComponentRef Id="MarbleBlueMarbleData" />
+        <ComponentRef Id="MarbleCityLightsData" />
+        <ComponentRef Id="MarbleSrtmData" />
+        <ComponentRef Id="MarbleMwdbiiData" />
+        <ComponentRef Id="MarblePlacemarkData" />
+        <ComponentRef Id="MarbleStarsData" />
+        <ComponentRef Id="MarbleSvgData" />
+      </ComponentGroup>
+    <?endif?>
 
     <!-- Application shortcuts and menu items -->
     <DirectoryRef Id="TARGETDIR">
@@ -292,12 +301,14 @@
         <ComponentRef Id="VidaliaExecutable" />
         <ComponentRef Id="VidaliaDocuments" />
         <ComponentRef Id="QtLibrary" />
-        <ComponentRef Id="QtImageFormatPlugins" />
         <ComponentRef Id="MinGWLibrary" />
         <ComponentRef Id="OpenSSLLibrary" />
-        <ComponentRef Id="MarbleWidgetLibrary" />
-        <ComponentRef Id="MarblePlugins" />
-        <ComponentGroupRef Id="MarbleData"/>
+        <?if $(var.UseMarble) = "ON"?>
+          <ComponentRef Id="QtImageFormatPlugins" />
+          <ComponentRef Id="MarbleWidgetLibrary" />
+          <ComponentRef Id="MarblePlugins" />
+          <ComponentGroupRef Id="MarbleData"/>
+        <?endif?>
       </Feature>
       <Feature Id="Shortcuts" Title="Shortcuts"
                AllowAdvertise="no" Absent="allow" Level="1"
Prev by Author: [vidalia-svn] r3628: Forward port the 0.1.12 changelog. (vidalia/trunk)
Next by Author: [vidalia-svn] r3631: Update the 0.2.0 changelog. (vidalia/trunk)
Previous by thread: [vidalia-svn] r3629: update the bunde-ds_store, even though it needs to be update (vidalia/trunk/pkg/osx)
Next by thread: [vidalia-svn] r3631: Update the 0.2.0 changelog. (vidalia/trunk)
Index(es):
- Author
- Thread