[banshee] windows: Remove installer check for Gtk#



commit a3c297b9737d4714f1f2a505d6d700882256d483
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Thu Feb 3 13:30:25 2011 -0600

    windows: Remove installer check for Gtk#

 build/windows/InstallerDefinition.wxs |   13 -------------
 build/windows/build-installer.js      |    4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/build/windows/InstallerDefinition.wxs b/build/windows/InstallerDefinition.wxs
index 7ecab2f..9e7a63b 100644
--- a/build/windows/InstallerDefinition.wxs
+++ b/build/windows/InstallerDefinition.wxs
@@ -16,25 +16,12 @@
     <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" 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>
 
-    <!-- Get the GTK# install directory -->
-    <Property Id="GTKSHARPPATH">
-      <RegistrySearch Id="gspath" Root="HKLM" Key="SOFTWARE\Novell\GtkSharp\InstallFolder" Type="raw" />
-    </Property>
-          
     <!-- Major upgrade -->
     <Upgrade Id="$(var.UpgradeCode)">
       <UpgradeVersion Minimum="$(var.ProductVersion)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED" />
diff --git a/build/windows/build-installer.js b/build/windows/build-installer.js
index fae98d9..4f49a16 100644
--- a/build/windows/build-installer.js
+++ b/build/windows/build-installer.js
@@ -16,8 +16,8 @@ var heat = "\"" + env("WIX") + "bin\\heat.exe\"";
 //build ("..\\..\\Banshee.sln");
 
 // Delete some files that might be created by running uninstalled
-if (fs.FileExists ("registry.bin")) fs.DeleteFile ("registry.bin");
-if (fs.FolderExists ("addin-db-001")) fs.DeleteFolder ("addin-db-001");
+if (fs.FileExists (bin + "\\registry.bin")) fs.DeleteFile (bin + "\\registry.bin");
+if (fs.FolderExists (bin + "\\addin-db-001")) fs.DeleteFolder (bin + "\\addin-db-001");
 
 // We can't just heat the entire dir b/c it would include the .git/ directory
 heatDir ("bin");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]