Merge lp:~mandel/ubuntuone-windows-installer/check_gtk_installed into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

The bootstrapper checks that gtk-sharp is not present, if it is present, the gtk-sharp installation will not be performed.

[Stuart Colville (muffinresearch)]

Works as expected with gtk-sharp present and after removing it.

review: Approve

[Tim Cole (tcole)]

review: Approve

=== modified file 'install/InstallerProject.xml'
--- install/InstallerProject.xml	2010-07-19 12:45:11 +0000
+++ install/InstallerProject.xml	2010-07-20 08:54:46 +0000
@@ -8,9 +8,8 @@
         <download componentname="Download Ubuntu One installer" sourceurl="http://s3.amazonaws.com/u1wintest/UbuntuOne.msi" sourcepath="" destinationpath="#TEMPPATH\ubuntuone" destinationfilename="ubuntuone.msi" alwaysdownload="True" clear_cache="False" />
       </downloaddialog>
     </component>
-    <component package="#TEMPPATH\ubuntuone\gtksharp.msi" cmdparameters="" cmdparameters_silent="/qn" cmdparameters_basic="/qb-" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" id="gtksharp.msi" display_name="Gtk Sharp (required if you are installing Tomboy)" uninstall_display_name="" os_filter_greater="80" os_filter_smaller="" os_filter_lcid="" type="msi" installcompletemessage="" uninstallcompletemessage="" mustreboot="False" reboot_required="" must_reboot_required="False" failed_exec_command_continue="" allow_continue_on_error="True" required="True" selected="True" note="" processor_architecture_filter="" status_installed="" status_notinstalled="" supports_install="True" supports_uninstall="True">
-      <installedcheck path="SOFTWARE\MyCompany\MyApplication\1.0.1.0" fieldname="Installed" fieldvalue="1" defaultvalue="False" fieldtype="REG_DWORD" comparison="match" rootkey="HKEY_LOCAL_MACHINE" wowoption="NONE" type="check_registry_value" description="Installed Check" />
-      <installedcheck path="SOFTWARE\MyCompany\MyApplication\1.0.1.0" fieldname="Installed" fieldvalue="1" defaultvalue="False" fieldtype="REG_DWORD" comparison="match" rootkey="HKEY_LOCAL_MACHINE" wowoption="NONE" type="check_registry_value" description="Installed Check" />
+    <component package="#TEMPPATH\ubuntuone\gtksharp.msi" cmdparameters="" cmdparameters_silent="/qn" cmdparameters_basic="/qb-" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" id="gtksharp.msi" display_name="Gtk Sharp" uninstall_display_name="" os_filter_greater="80" os_filter_smaller="" os_filter_lcid="" type="msi" installcompletemessage="" uninstallcompletemessage="" mustreboot="False" reboot_required="" must_reboot_required="False" failed_exec_command_continue="" allow_continue_on_error="True" required="True" selected="True" note="" processor_architecture_filter="" status_installed="" status_notinstalled="" supports_install="True" supports_uninstall="True">
+      <installedcheck path="SOFTWARE\Novell\GtkSharp\Version" fieldname="" fieldvalue="2.12.10" defaultvalue="False" fieldtype="REG_SZ" comparison="version_ge" rootkey="HKEY_LOCAL_MACHINE" wowoption="NONE" type="check_registry_value" description="Gtk Installed" />
       <downloaddialog dialog_caption="Gtk Sharp - Downloading Components" dialog_message="Press 'Start' to download the required components for installing &quot;Gtk Sharp&quot;." dialog_message_downloading="Downloading ..." dialog_message_copying="Copying ..." dialog_message_connecting="Connecting ..." dialog_message_sendingrequest="Sending request ..." autostartdownload="True" buttonstart_caption="Start" buttoncancel_caption="Cancel">
         <download componentname="Download GtkSharp installer" sourceurl="http://s3.amazonaws.com/u1wintest/gtk-sharp-2.12.10.win32.msi" sourcepath="" destinationpath="#TEMPPATH\ubuntuone" destinationfilename="gtksharp.msi" alwaysdownload="True" clear_cache="False" />
       </downloaddialog>