diff options
| author | Jonathan Pobst <monkey@jpobst.com> | 2009-08-25 21:32:51 +0400 |
|---|---|---|
| committer | Jonathan Pobst <monkey@jpobst.com> | 2009-08-25 21:32:51 +0400 |
| commit | b534a8dbcb4014de91f35a457a46a1345bbe181e (patch) | |
| tree | 407823f3cd3337d0ccfcbb2ba7756d7b2c561bf9 /setup | |
| parent | 92524f48ac38d31dbe215e0d3e42c27a39e539a4 (diff) | |
- Add a check for .NET 3.5.
- Add a check for Gtk# 2.12.9+.
svn path=/trunk/monodevelop/; revision=140651
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/WixSetup/Product.wxs | 14 | ||||
| -rw-r--r-- | setup/WixSetup/WixSetup.wixproj | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/setup/WixSetup/Product.wxs b/setup/WixSetup/Product.wxs index dc446d6a02..034c8a0701 100644 --- a/setup/WixSetup/Product.wxs +++ b/setup/WixSetup/Product.wxs @@ -12,6 +12,20 @@ <Package Id="*" Compressed="yes" Description="$(var.ProductShortName) $(var.ProductVersionText) ($(var.ProductVersion))" InstallerVersion="200" ShortNames="no" Manufacturer="$(var.Manufacturer)" />
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
+ <!-- Ensure GTK# 2.12.9+ is installed -->
+ <Property Id="GTKSHARPVERSION">
+ <RegistrySearch Id="gsversion" Root="HKLM" Key="SOFTWARE\Novell\GtkSharp\Version" Type="raw" />
+ </Property>
+ <Condition Message="Gtk# version 2.12.9 or greater must be installed.">
+ <![CDATA[GTKSHARPVERSION >= "2.12.9" OR REMOVE ~= "ALL"]]>
+ </Condition>
+
+ <!-- Ensure .Net 3.5 is installed -->
+ <PropertyRef Id="NETFRAMEWORK35" />
+ <Condition Message="This setup requires the .NET Framework 3.5 to be installed.">
+ Installed OR NETFRAMEWORK35
+ </Condition>
+
<!-- Major upgrade -->
<Upgrade Id="$(var.UpgradeCode)">
<UpgradeVersion Minimum="$(var.ProductVersion)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED" />
diff --git a/setup/WixSetup/WixSetup.wixproj b/setup/WixSetup/WixSetup.wixproj index 64b3fd130a..eb0fdbdc62 100644 --- a/setup/WixSetup/WixSetup.wixproj +++ b/setup/WixSetup/WixSetup.wixproj @@ -22,6 +22,9 @@ <Compile Include="Product.wxs" />
</ItemGroup>
<ItemGroup>
+ <WixExtension Include="WixNetFxExtension">
+ <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+ </WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
</WixExtension>
|