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

[Manuel de la Peña]

This branch proposes a different approach when creating the installer. Due to the nature of the windows installers (msi) just a single msi can be installed at a time. Rather than create a "monster" msi, this branch uses a bootstrapper that will concatenate the different msi to be used in the installation.

In order to test that the branch works as expected the following commands should be executed:

tools\Nant\bin\nant.exe installer (to ensure that the UbuntuOne.msi is correctly created)
tools\Nant\bin\nant.exe bootstrapper (to ensure that the bootstrapper is correctly created)

Once the bootstrapper is created you will find a setup.exe that will allow you to install:

Ubuntu One (is just a stub)
Tomboy (currently downloaded from S3)
Gtk Sharp (needed to execute Tomboy)

[lp:~mandel/ubuntuone-windows-installer/fix_gtk_installer]

12. By Manuel de la Peña on 2010-07-19

Updates the README with information regarding the creating of the msi installer and the bootstrapper.

[John Lenton (chipaca)]

In dialog_message, you want a space between the . and the The in
“Ubuntu One is the personal cloud service that simplifies your digital
life.The Ubuntu One bundle”

[lp:~mandel/ubuntuone-windows-installer/fix_gtk_installer]

13. By Manuel de la Peña on 2010-07-19

Fix typo in the dialog text.

[Manuel de la Peña (mandel)]

> In dialog_message, you want a space between the . and the The in
> “Ubuntu One is the personal cloud service that simplifies your digital
> life.The Ubuntu One bundle”

Thx, sorted.

[lp:~mandel/ubuntuone-windows-installer/fix_gtk_installer]

14. By Manuel de la Peña on 2010-07-19

Add missing dotNetInstaller bins

15. By Manuel de la Peña on 2010-07-19

The gtk installer shoul dbe executed before the tomboy one, otherwhise the installer will not be able to finish.

[Stuart Colville (muffinresearch)]

Works as expected.

review: Approve

[Vincenzo Di Somma (vds)]

Tests pass, installer builds, installer install/disinstall everything fine.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-07-15 08:24:53 +0000
+++ .bzrignore	2010-07-19 12:47:46 +0000
@@ -44,3 +44,4 @@
 UbuntuOne.wixobj
 UbuntuOne.wixpdb
 tomboy
+setup.exe

=== modified file 'README.txt'
--- README.txt	2010-07-13 15:47:22 +0000
+++ README.txt	2010-07-19 12:47:46 +0000
@@ -31,6 +31,14 @@
 
 	Compiles the solution using the "build" target and runs the unit tests. The output of the unit tests will be placed in a newly created dir at the 
 	root called "test-results".
+	
+	2.5 installer
+	
+	Creates an msi installer that can be used to install Ubuntu One in a windows machine.
+	
+	2.6 bootstrapper
+	
+	Crates a boot strapper that will allow to install a bundle with UbuntuOne that includes Tomboy and Gtk sharp if needed.
 
 In order to execute the build script execute at the root of the project
 

=== added file 'install/InstallerProject.xml'
--- install/InstallerProject.xml	1970-01-01 00:00:00 +0000
+++ install/InstallerProject.xml	2010-07-19 12:47:46 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configurations lcid_type="UserExe" show_language_selector="True" language_selector_title="Choose your language" language_selector_ok="OK" language_selector_cancel="Cancel" configuration_no_match_message="" ui_level="full" fileversion="" productversion="" log_enabled="True" log_file="#TEMPPATH\UbuntuOneInstallerLog.txt">
+  <schema version="1.9.5931.0" generator="dotNetInstaller InstallerEditor" />
+  <configuration dialog_caption="Ubuntu One Installer" dialog_message="Ubuntu One is the personal cloud service that simplifies your digital life. The Ubuntu One bundle bring to you windows machine a great collection of Open Source software that will simplify your digital life." dialog_message_uninstall="" dialog_bitmap="#APPPATH\banner.bmp" skip_caption="Skip" install_caption="Install" uninstall_caption="Uninstall" cancel_caption="Close" status_installed=" (Installed)" status_notinstalled="" failed_exec_command_continue="Failed to install %s. Continue with others components?" installation_completed="Unbutu One Bundle installed successfully!" uninstallation_completed="Unbutu One Bundle uninstalled successfully!" installation_none="Unbutu One Bundle is already installed!" uninstallation_none="Unbutu One Bundle is not installed!" installing_component_wait="Installing %s. Wait, this operation could take some time ..." uninstalling_component_wait="Uninstalling %s. Wait, this operation could take some time ..." reboot_required="To continue the installation you must restart your computer. Restart now?" must_reboot_required="False" dialog_otherinfo_caption="" dialog_otherinfo_link="" complete_command="" complete_command_silent="" complete_command_basic="" wait_for_complete_command="True" auto_close_if_installed="True" auto_close_on_error="False" allow_continue_on_error="True" dialog_show_installed="True" dialog_show_uninstalled="True" dialog_show_required="True" cab_dialog_message="%s" cab_cancelled_message="" cab_dialog_caption="" cab_path="#TEMPPATH\#GUID" cab_path_autodelete="True" dialog_position="" dialog_components_list_position="" dialog_message_position="" dialog_bitmap_position="" dialog_otherinfo_link_position="" dialog_osinfo_position="" dialog_install_button_position="" dialog_cancel_button_position="" dialog_skip_button_position="" auto_start="False" auto_continue_on_reboot="False" reboot_cmd="" type="install" lcid_filter="1033, 2057, 3081, 10249, 4105, 9225, 15369, 16393, 14345, 6153, 8201, 17417, 5129, 13321, 18441, 7177, 11273, 12297" language_id="2057" language="English" os_filter_greater="80" os_filter_smaller="" processor_architecture_filter="" supports_install="True" supports_uninstall="True">
+    <component package="#TEMPPATH\ubuntuone\ubuntuone.msi" cmdparameters="" cmdparameters_silent="/qn" cmdparameters_basic="/qb-" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" id="UbuntuOne.msi" display_name="Ubuntu One" uninstall_display_name="" os_filter_greater="80" os_filter_smaller="" os_filter_lcid="" type="msi" installcompletemessage="The Ubuntu One components were correctly installed." uninstallcompletemessage="The Ubuntu One components were correctly uninstalled." mustreboot="False" reboot_required="False" must_reboot_required="False" failed_exec_command_continue="" allow_continue_on_error="False" required="True" selected="True" note="This components provides the based components provided by Ubuntu One" processor_architecture_filter="x86" status_installed="" status_notinstalled="" supports_install="True" supports_uninstall="True">
+      <installedcheck path="SOFTWARE\Canonical\UbuntuOne" fieldname="UBUNTUONE_INSTALLDIR" fieldvalue="1" defaultvalue="False" fieldtype="REG_DWORD" comparison="value_exists" rootkey="HKEY_LOCAL_MACHINE" wowoption="NONE" type="check_registry_value" description="Installed Check" />
+      <downloaddialog dialog_caption="Ubuntu One - Downloading Components" dialog_message="Press 'Start' to download the required components for installing &quot;Ubuntu One&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 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" />
+      <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>
+    </component>
+    <component package="#TEMPPATH\ubuntuone\tomboy.msi" cmdparameters="" cmdparameters_silent="/qn" cmdparameters_basic="/qb-" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" id="Tomboy.msi" display_name="Tomboy Notes" 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="False" selected="True" note="" processor_architecture_filter="x86" 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" />
+      <downloaddialog dialog_caption="Tomboy - Downloading Components" dialog_message="Press 'Start' to download the required components for installing &quot;Tomboy&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 Tomboy installer" sourceurl="http://s3.amazonaws.com/u1wintest/Tomboy-1.2.2.msi" sourcepath="" destinationpath="#TEMPPATH\ubuntuone" destinationfilename="tomboy.msi" alwaysdownload="True" clear_cache="False" />
+      </downloaddialog>
+    </component>
+  </configuration>
+  <configuration dialog_caption="APPLICATION_NAME Installer" dialog_message="In order to install APPLICATION_NAME you must first install these components:" dialog_message_uninstall="" dialog_bitmap="#APPPATH\banner.bmp" skip_caption="Skip" install_caption="Install" uninstall_caption="Uninstall" cancel_caption="Close" status_installed=" (Installed)" status_notinstalled="" failed_exec_command_continue="Failed to install %s. Continue with others components?" installation_completed="APPLICATION_NAME installed successfully!" uninstallation_completed="APPLICATION_NAME uninstalled successfully!" installation_none="APPLICATION_NAME is already installed!" uninstallation_none="APPLICATION_NAME is not installed!" installing_component_wait="Installing %s. Wait, this operation could take some time ..." uninstalling_component_wait="Uninstalling %s. Wait, this operation could take some time ..." reboot_required="To continue the installation you must restart your computer. Restart now?" must_reboot_required="False" dialog_otherinfo_caption="" dialog_otherinfo_link="" complete_command="" complete_command_silent="" complete_command_basic="" wait_for_complete_command="True" auto_close_if_installed="True" auto_close_on_error="False" allow_continue_on_error="True" dialog_show_installed="True" dialog_show_uninstalled="True" dialog_show_required="True" cab_dialog_message="%s" cab_cancelled_message="" cab_dialog_caption="" cab_path="#TEMPPATH\#GUID" cab_path_autodelete="True" dialog_position="" dialog_components_list_position="" dialog_message_position="" dialog_bitmap_position="" dialog_otherinfo_link_position="" dialog_osinfo_position="" dialog_install_button_position="" dialog_cancel_button_position="" dialog_skip_button_position="" auto_start="False" auto_continue_on_reboot="False" reboot_cmd="" type="install" lcid_filter="3082, 1034, 11274, 16394, 13322, 9226, 5130, 7178, 12298, 17418, 4106, 18442, 22538, 2058, 19466, 6154, 15370, 10250, 20490,  21514, 14346, 8202" language_id="3082" language="Español" os_filter_greater="80" os_filter_smaller="" processor_architecture_filter="x86" supports_install="True" supports_uninstall="True">
+    <component package="#APPPATH\mysetup.msi" cmdparameters="" cmdparameters_silent="/qn" cmdparameters_basic="/qb-" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" id="UbunuOneSpanish.msi" display_name="Ubuntu One" uninstall_display_name="" os_filter_greater="" 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="False" 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" />
+      <downloaddialog dialog_caption="COMPONENT_NAME - Download Components" dialog_message="Press 'Start' to download the required components for installing COMPONENT_NAME." 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 File" sourceurl="http://www.yourwebsite.com/SetupX/Setup.exe" sourcepath="" destinationpath="#TEMPPATH\APP_TEMP_DOWNLOADPATH" destinationfilename="" alwaysdownload="True" clear_cache="False" />
+      </downloaddialog>
+    </component>
+    <component package="#APPPATH\mysetup.msi" cmdparameters="" cmdparameters_silent="/qn" cmdparameters_basic="/qb-" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" id="mysetup.msi" display_name="mysetup.msi" uninstall_display_name="" os_filter_greater="" 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="False" 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" />
+      <downloaddialog dialog_caption="COMPONENT_NAME - Download Components" dialog_message="Press 'Start' to download the required components for installing COMPONENT_NAME." 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 File" sourceurl="http://www.yourwebsite.com/SetupX/Setup.exe" sourcepath="" destinationpath="#TEMPPATH\APP_TEMP_DOWNLOADPATH" destinationfilename="" alwaysdownload="True" clear_cache="False" />
+      </downloaddialog>
+    </component>
+    <component package="#APPPATH\mysetup.msi" cmdparameters="" cmdparameters_silent="/qn" cmdparameters_basic="/qb-" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" id="mysetup.msi" display_name="mysetup.msi" uninstall_display_name="" os_filter_greater="" 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="False" 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" />
+      <downloaddialog dialog_caption="COMPONENT_NAME - Download Components" dialog_message="Press 'Start' to download the required components for installing COMPONENT_NAME." 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 File" sourceurl="http://www.yourwebsite.com/SetupX/Setup.exe" sourcepath="" destinationpath="#TEMPPATH\APP_TEMP_DOWNLOADPATH" destinationfilename="" alwaysdownload="True" clear_cache="False" />
+      </downloaddialog>
+    </component>
+  </configuration>
+</configurations>
\ No newline at end of file

=== removed file 'install/Tomboy.wxs'
--- install/Tomboy.wxs	2010-07-15 08:22:36 +0000
+++ install/Tomboy.wxs	1970-01-01 00:00:00 +0000
@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment  Id="TomboyFragment">
-		<DirectoryRef Id="TOMBOY_INSTALLDIR" >
-			<Component Id="TOMBOY_INSTALLDIR" 
-					   Guid="{D1F1C647-7D55-4AD2-B765-4152B337546E}">
-				<RegistryKey Id="TomboyRegKey" 
-				             Action="createAndRemoveOnUninstall" 
-							 Key="Software\Tomboy" 
-							 Root="HKLM" />
-				<RegistryValue Id="WriteTomboyTOMBOY_INSTALLDIR" 
-				               Root="HKLM" 
-							   Key="Software\Tomboy" 
-							   Name="TOMBOY_INSTALLDIR" 
-							   Value="[TOMBOY_INSTALLDIR]" 
-							   Type="string" 
-							   KeyPath="yes" />
-				<RemoveFolder Id="TOMBOY_INSTALLDIR" 
-				              Directory="TOMBOY_INSTALLDIR" 
-							  On="uninstall" />
-			</Component>
-			<Component Id="TomboyCore" 
-			           Guid="{01F111EB-3C6C-4E5B-8655-7922ED600DAC}">
-				<File Id="Tomboy.exe" 
-				      Name="Tomboy.exe" 
-					  KeyPath="yes" 
-					  DiskId="1" 
-					  Source="tomboy\File\Tomboy.exe" />
-				<File Id="LicenseFile" 
-				      Name="license.rtf" 
-					  DiskId="1" 
-					  Source="tomboy\File\LicenseFile" />
-				<File Id="README" 
-				      Name="README" 
-					  DiskId="1" 
-					  Source="tomboy\File\README" />
-				<File Id="COPYING" 
-					  Name="COPYING" 
-					  DiskId="1" 
-					  Source="tomboy\File\COPYING" />
-				<File Id="NEWS" 
-					  Name="NEWS" 
-					  DiskId="1" 
-					  Source="tomboy\File\NEWS" />
-				<File Id="AUTHORS" 
-				      Name="AUTHORS" 
-					  DiskId="1" 
-					  Source="tomboy\File\AUTHORS" />
-				<File Id="Backlinks.dll" 
-				      Name="Backlinks.dll" 
-					  ShortName="hmtgksop.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\Backlinks.dll" />
-				<File Id="Bugzilla.dll" 
-				      Name="Bugzilla.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\Bugzilla.dll" />
-				<File Id="ExportToHtml.dll" 
-				      Name="ExportToHtml.dll" 
-					  ShortName="vygw-2yh.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\ExportToHtml.dll" />
-				<File Id="ExportToHtml.xsl" 
-				      Name="ExportToHtml.xsl" 
-					  ShortName="g7ured_x.xsl" 
-					  DiskId="1" 
-					  Source="tomboy\File\ExportToHtml.xsl" />
-				<File Id="FileSystemSyncService.dll" 
-				      Name="FileSystemSyncService.dll" 
-					  ShortName="oryuihs_.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\FileSystemSyncService.dll" />
-				<File Id="FixedWidth.dll" 
-				      Name="FixedWidth.dll" 
-					  ShortName="-ce-ysdy.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\FixedWidth.dll" />
-				<File Id="ICSharpCode.SharpZipLib.dll" 
-				      Name="ICSharpCode.SharpZipLib.dll" 
-					  ShortName="p6b88vwm.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\ICSharpCode.SharpZipLib.dll" />
-				<File Id="InsertTimestamp.dll" 
-				      Name="InsertTimestamp.dll" 
-					  ShortName="bvnxamjb.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\InsertTimestamp.dll" />
-				<File Id="Mono.Addins.dll" 
-				      Name="Mono.Addins.dll" 
-					  ShortName="pzlrnez_.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\Mono.Addins.dll" />
-				<File Id="Mono.Addins.dll.config" 
-					  Name="Mono.Addins.dll.config" 
-					  ShortName="qrp80-s0.con" 
-					  DiskId="1" 
-					  Source="tomboy\File\Mono.Addins.dll.config" />
-				<File Id="Mono.Addins.CecilReflector.dll" 
-				      Name="Mono.Addins.CecilReflector.dll" 
-					  ShortName="mdb0gs5g.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\Mono.Addins.CecilReflector.dll" />
-				<File Id="Mono.Addins.Gui.dll" 
-				      Name="Mono.Addins.Gui.dll" 
-					  ShortName="pxkyupof.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\Mono.Addins.Gui.dll" />
-				<File Id="Mono.Addins.Setup.dll" 
-				      Name="Mono.Addins.Setup.dll" 
-					  ShortName="tklrdv8o.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\Mono.Addins.Setup.dll" />
-				<File Id="Mono.Posix.dll" 
-				      Name="Mono.Posix.dll" 
-					  ShortName="39t907ef.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\Mono.Posix.dll" />
-				<File Id="MonoPosixHelper.dll" 
-				      Name="MonoPosixHelper.dll" 
-					  ShortName="7uuudfuk.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\MonoPosixHelper.dll" />
-				<File Id="NoteDirectoryWatcher.dll" 
-				      Name="NoteDirectoryWatcher.dll" 
-					  ShortName="v4yyszyp.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\NoteDirectoryWatcher.dll" />
-				<File Id="NoteOfTheDay.dll" 
-				      Name="NoteOfTheDay.dll" 
-					  ShortName="7-2c8ja7.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\NoteOfTheDay.dll" />
-				<File Id="PrintNotes.dll" 
-				      Name="PrintNotes.dll" 
-					  ShortName="ddzyzxcj.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\PrintNotes.dll" />
-				<File Id="Underline.dll" 
-				      Name="Underline.dll" 
-					  ShortName="ynxcthks.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\Underline.dll" />
-				<File Id="WebSyncServiceAddin.dll" 
-				      Name="WebSyncServiceAddin.dll" 
-					  ShortName="buusdodu.dll" 
-					  DiskId="1" 
-					  Source="tomboy\File\WebSyncServiceAddin.dll" />
-				<File Id="Backlinks.pdb" 
-				      Name="Backlinks.pdb" 
-					  ShortName="9boqbr1o.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\Backlinks.pdb" />
-				<File Id="Bugzilla.pdb" 
-				      Name="Bugzilla.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\Bugzilla.pdb" />
-				<File Id="ExportToHtml.pdb" 
-				      Name="ExportToHtml.pdb" 
-					  ShortName="ypwomz1a.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\ExportToHtml.pdb" />
-				<File Id="FileSystemSyncService.pdb" 
-				      Name="FileSystemSyncService.pdb" 
-					  ShortName="-1nszmgn.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\FileSystemSyncService.pdb" />
-				<File Id="FixedWidth.pdb" 
-				      Name="FixedWidth.pdb" 
-					  ShortName="ipkzwxsa.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\FixedWidth.pdb" />
-				<File Id="InsertTimestamp.pdb" 
-				      Name="InsertTimestamp.pdb" 
-					  ShortName="c4mzjbtr.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\InsertTimestamp.pdb" />
-				<File Id="NoteDirectoryWatcher.pdb" 
-				      Name="NoteDirectoryWatcher.pdb" 
-					  ShortName="gmshizle.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\NoteDirectoryWatcher.pdb" />
-				<File Id="NoteOfTheDay.pdb" 
-				      Name="NoteOfTheDay.pdb" 
-					  ShortName="bjgbecem.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\NoteOfTheDay.pdb" />
-				<File Id="PrintNotes.pdb" 
-				      Name="PrintNotes.pdb" 
-					  ShortName="nxkuyumx.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\PrintNotes.pdb" />
-				<File Id="Underline.pdb" 
-				      Name="Underline.pdb" 
-					  ShortName="7nz715zz.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\Underline.pdb" />
-				<File Id="WebSyncServiceAddin.pdb" 
-				      Name="WebSyncServiceAddin.pdb" 
-					  ShortName="dk8ufpsa.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\WebSyncServiceAddin.pdb" />
-				<File Id="Tomboy.pdb" 
-				      Name="Tomboy.pdb" 
-					  DiskId="1" 
-					  Source="tomboy\File\Tomboy.pdb" />
-				<File Id="note.ico" 
-				      Name="note.ico" 
-					  DiskId="1" 
-					  Source="tomboy\File\note.ico" />
-				<File Id="new_note.ico" 
-				      Name="new_note.ico" 
-					  DiskId="1" 
-					  Source="tomboy\File\new_note.ico" />
-				<File Id="search.ico" 
-				      Name="search.ico" 
-					  DiskId="1" 
-					  Source="tomboy\File\search.ico" />
-				<Shortcut Id="startmenuTomboy" 
-				          Directory="ProgramMenuFolder" 
-						  Name="Tomboy Notes" 
-						  ShortName="ncwoopnw" 
-						  Description="Tomboy Notes" 
-						  Icon="Tomboy.exe" 
-						  IconIndex="0" 
-						  WorkingDirectory="TOMBOY_INSTALLDIR" 
-						  Advertise="yes" />
-				<Shortcut Id="desktopTomboy" 
-				          Directory="DesktopFolder" 
-						  Name="Tomboy Notes" 
-						  ShortName="nvwy6ted" 
-						  Description="Tomboy Notes" 
-						  Icon="Tomboy.exe" 
-						  IconIndex="0" 
-						  WorkingDirectory="TOMBOY_INSTALLDIR" 
-						  Advertise="yes" />
-			</Component>
-			<Directory Id="tomboy" 
-			           Name="tomboy">
-				<Directory Id="icons" 
-				           Name="icons">
-					<Directory Id="hicolor" 
-					           Name="hicolor">
-						<Directory Id="_6x16" 
-						           Name="16x16">
-							<Directory Id="actions16" 
-							           Name="actions">
-								<Component Id="Note_newPng" 
-								           Guid="{2F7685A9-DF0E-4471-9308-D3986E1E1A76}">
-									<File Id="note_new.png" 
-									      Name="note-new.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\note_new.png" />
-								</Component>
-							</Directory>
-							<Directory Id="apps16" 
-							           Name="apps">
-								<Component Id="TomboyPng" 
-								           Guid="{5765C385-C549-4976-8E32-0D9218B666B3}">
-									<File Id="tomboy.png" 
-									      Name="tomboy.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\tomboy.png" />
-								</Component>
-							</Directory>
-							<Directory Id="status16" 
-							           Name="status">
-								<Component Id="Pin_activePng" 
-								           Guid="{7DC80176-A1D9-4078-B09D-CA08D029728E}">
-									<File Id="pin_active.png" 
-									      Name="pin-active.png" 
-										  KeyPath="yes" 
-										  ShortName="he3eol5w.png" 
-										  DiskId="1" 
-										  Source="tomboy\File\pin_active.png" />
-								</Component>
-								<Component Id="Pin_downPng" 
-								           Guid="{03FEA52F-888F-43B1-9DE0-3934C88E8BF6}">
-									<File Id="pin_down.png" 
-									      Name="pin-down.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\pin_down.png" />
-								</Component>
-								<Component Id="Pin_upPng" 
-								           Guid="{3EB31AAD-392C-4B25-BD29-178C829FFA3E}">
-									<File Id="pin_up.png" 
-									      Name="pin-up.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\pin_up.png" />
-								</Component>
-							</Directory>
-							<Directory Id="places16" 
-							           Name="places" />
-						</Directory>
-						<Directory Id="_2x22" 
-						           Name="22x22">
-							<Directory Id="actions22" 
-							           Name="actions">
-								<Component Id="Filter_note_allPng" 
-								           Guid="{EE1BA642-20A2-4CF1-9356-D174F32EA91B}">
-									<File Id="filter_note_all.png" 
-									      Name="filter-note-all.png" 
-										  KeyPath="yes" 
-										  ShortName="zzbnlyvd.png" 
-										  DiskId="1" 
-										  Source="tomboy\File\filter_note_all.png" />
-								</Component>
-								<Component Id="Filter_note_unfiledPng" 
-								           Guid="{48ED3CD0-FDF0-4A76-8609-1C6ACF436003}">
-									<File Id="filter_note_unfiled.png" 
-									      Name="filter-note-unfiled.png" 
-										  KeyPath="yes" 
-										  ShortName="xlakxsn8.png" 
-										  DiskId="1" 
-										  Source="tomboy\File\filter_note_unfiled.png" />
-								</Component>
-							</Directory>
-							<Directory Id="apps22" 
-							           Name="apps">
-								<Component Id="AppsTomboyPng" 
-								           Guid="{23BD730D-537E-49C0-81B2-E687DD458B31}">
-									<File Id="apps.tomboy.png" 
-									      Name="tomboy.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\apps.tomboy.png" />
-								</Component>
-							</Directory>
-							<Directory Id="places22" 
-							           Name="places">
-								<Component Id="NotePng" 
-								           Guid="{A421B2BE-7618-484E-B79C-4A583395E847}">
-									<File Id="note.png" 
-									      Name="note.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\note.png" />
-								</Component>
-								<Component Id="NotebookPng" 
-								           Guid="{6F91DF63-6D53-4ACF-AFFD-756A87108A74}">
-									<File Id="notebook.png" 
-									      Name="notebook.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\notebook.png" />
-								</Component>
-							</Directory>
-							<Directory Id="status22" 
-							           Name="status" />
-						</Directory>
-						<Directory Id="_4x24" 
-						           Name="24x24">
-							<Directory Id="apps24" 
-							           Name="apps">
-								<Component Id="AppsTomboyPng1" 
-								           Guid="{2EEEDADB-BFAB-486E-8A90-4FB849924813}">
-									<File Id="apps.tomboy1.png" 
-									      Name="tomboy.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\apps.tomboy1.png" />
-								</Component>
-							</Directory>
-							<Directory Id="actions24" 
-							           Name="actions" />
-							<Directory Id="places24" 
-							           Name="places" />
-							<Directory Id="status24" 
-							           Name="status" />
-						</Directory>
-						<Directory Id="_2x32" 
-						           Name="32x32">
-							<Directory Id="apps32" 
-							           Name="apps">
-								<Component Id="AppsTomboyPng2" 
-								           Guid="{7C4CA97A-AF77-452F-B848-9655BD322337}">
-									<File Id="apps.tomboy2.png" 
-									      Name="tomboy.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\apps.tomboy2.png" />
-								</Component>
-							</Directory>
-							<Directory Id="actions32" 
-							           Name="actions" />
-							<Directory Id="places32" 
-							           Name="places" />
-							<Directory Id="status32" 
-							           Name="status" />
-						</Directory>
-						<Directory Id="_8x48" 
-						           Name="48x48">
-							<Directory Id="actions48" 
-							           Name="actions">
-								<Component Id="Notebook_newPng" 
-								           Guid="{88DE93FC-41BD-456B-B3F9-2DFB6C9970F4}">
-									<File Id="notebook_new.png" 
-									      Name="notebook-new.png" 
-										  KeyPath="yes" 
-										  ShortName="mnquckro.png" 
-										  DiskId="1" 
-										  Source="tomboy\File\notebook_new.png" />
-								</Component>
-							</Directory>
-							<Directory Id="apps48" 
-							           Name="apps">
-								<Component Id="AppsTomboyPng3" 
-								           Guid="{4B6E164C-E3E8-4B28-8FF4-2E48BA766A02}">
-									<File Id="apps.tomboy3.png" 
-									      Name="tomboy.png" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\apps.tomboy3.png" />
-								</Component>
-							</Directory>
-							<Directory Id="places48" 
-							           Name="places" />
-							<Directory Id="status48" 
-							           Name="status" />
-						</Directory>
-						<Directory Id="scalable" 
-						           Name="scalable">
-							<Directory Id="apps" 
-							           Name="apps">
-								<Component Id="TomboySvg" 
-								           Guid="{ED86C52A-2B08-4E59-9702-156DB2601F9A}">
-									<File Id="tomboy.svg" 
-									      Name="tomboy.svg" 
-										  KeyPath="yes" 
-										  DiskId="1" 
-										  Source="tomboy\File\tomboy.svg" />
-								</Component>
-							</Directory>
-							<Directory Id="actions" 
-							           Name="actions" />
-							<Directory Id="places" 
-							           Name="places" />
-							<Directory Id="status" 
-							           Name="status" />
-						</Directory>
-					</Directory>
-				</Directory>
-			</Directory>
-		</DirectoryRef>
-		<Icon Id="Tomboy.exe" 
-			  SourceFile="tomboy\Icon\Tomboy.exe" />
-		
-    </Fragment>
-</Wix>
\ No newline at end of file

=== modified file 'install/UbuntuOne.wxs'
--- install/UbuntuOne.wxs	2010-07-15 08:22:36 +0000
+++ install/UbuntuOne.wxs	2010-07-19 12:47:46 +0000
@@ -60,29 +60,6 @@
 				 Title="Ubuntu One"
 				 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">
 		</Feature>
-		<Feature Id="TomboyNotes" 
-				 ConfigurableDirectory="TOMBOY_INSTALLDIR" 
-				 Description="Take notes, link ideas, and stay organized." 
-				 Level="1" 
-				 Title="Tomboy Notes">
-            <ComponentRef Id="TOMBOY_INSTALLDIR" />
-            <ComponentRef Id="TomboyCore" Primary="yes" />
-            <ComponentRef Id="Note_newPng" />
-            <ComponentRef Id="TomboyPng" />
-            <ComponentRef Id="Pin_activePng" />
-            <ComponentRef Id="Pin_downPng" />
-            <ComponentRef Id="Pin_upPng" />
-            <ComponentRef Id="Filter_note_allPng" />
-            <ComponentRef Id="Filter_note_unfiledPng" />
-            <ComponentRef Id="AppsTomboyPng" />
-            <ComponentRef Id="NotePng" />
-            <ComponentRef Id="NotebookPng" />
-            <ComponentRef Id="AppsTomboyPng1" />
-            <ComponentRef Id="AppsTomboyPng2" />
-            <ComponentRef Id="Notebook_newPng" />
-            <ComponentRef Id="AppsTomboyPng3" />
-            <ComponentRef Id="TomboySvg" />
-        </Feature>
 			 
 		<!-- Provide the UI extensions to be used -->
 		<UIRef Id="WixUI_Mondo" />

=== added file 'install/dotNetInstaller.exe'
Binary files install/dotNetInstaller.exe	1970-01-01 00:00:00 +0000 and install/dotNetInstaller.exe	2010-07-19 12:47:46 +0000 differ
=== modified file 'main.build'
--- main.build	2010-07-15 08:23:04 +0000
+++ main.build	2010-07-19 12:47:46 +0000
@@ -3,9 +3,6 @@
 	<!-- the enviroment property allows to select which enviroment we are compiling to -->
 	<property name="enviroment" value="debug" />
 	
-	<!-- TODO: make this in a u1 server -->
-	<property name="tomboy_sorces" value="http://download.gnome.org/binaries/win32/tomboy/1.2/Tomboy-1.2.2.msi" />
-	
 	<!-- Please provide the path where the Wix binaries are located. -->
 	<property name="wix_path" value="C:\Program Files\Windows Installer XML v3\bin" />
 	
@@ -112,20 +109,6 @@
 		
 	</target>
 	
-	<target name="tomboy"
-			description="Downloads the msi of tomboy a decompiles it in order to create a merge msi.">
-			
-			<get src="${tomboy_sorces}" dest="tomboy.msi" unless="${file::exists('tomboy.msi')}"/>
-			
-			<!-- use dark against tomboy -->
-			<exec basedir="${wix_path}"
-			      useruntimeengine="true"
-                  workingdir="."
-			      program="dark.exe"
-			      commandline="tomboy.msi -x install/tomboy"
-				  unless="${directory::exists('install/tomboy')}"/>
-	</target>
-	
 	<target name="build" 
 	        description="Compiles all the different projects that form part of the solution." 
 			depends="clean, generate_protos">
@@ -160,20 +143,32 @@
 	
 	<target name="installer"
 	        description="Compiles the solution and create a merge installer that allows to install the solution and other related apps."
-			depends="build, tomboy">
+			depends="build">
 		
 		<!-- wix compiler -->
 		<exec basedir="${wix_path}"
 			  useruntimeengine="true"
               workingdir="install"
 			  program="candle.exe"
-			  commandline="Tomboy.wxs UbuntuOne.wxs"/>
+			  commandline=" UbuntuOne.wxs"/>
 			  
 		<!-- wix linker -->
 		<exec basedir="${wix_path}"
 			  useruntimeengine="true"
               workingdir="install"
 			  program="light.exe"
-			  commandline="-out UbuntuOne.msi -ext WixUIExtension Tomboy.wixobj UbuntuOne.wixobj"/>
+			  commandline="-out UbuntuOne.msi -ext WixUIExtension UbuntuOne.wixobj"/>
+			  
+		
+	</target>
+	
+	<target name="bootstrapper"
+			description="Creates a bootstrapper that will allow to install Ubuntu One, Tomboy and Gtk Sharp in the users machine.">
+			 
+		<exec basedir="tools/dotNetInstaller/bin"
+              useruntimeengine="true"
+              workingdir="install"
+              program="InstallerLinker.exe"
+              commandline="/Output:setup.exe /Template:dotNetInstaller.exe /Configuration:InstallerProject.xml /Embed+" />
 	</target>
 </project>
\ No newline at end of file

=== added directory 'tools/dotNetInstaller'
=== added directory 'tools/dotNetInstaller/bin'
=== added file 'tools/dotNetInstaller/bin/CabLib.dll'
Binary files tools/dotNetInstaller/bin/CabLib.dll	1970-01-01 00:00:00 +0000 and tools/dotNetInstaller/bin/CabLib.dll	2010-07-19 12:47:46 +0000 differ
=== added file 'tools/dotNetInstaller/bin/InstallerEditor.exe'
Binary files tools/dotNetInstaller/bin/InstallerEditor.exe	1970-01-01 00:00:00 +0000 and tools/dotNetInstaller/bin/InstallerEditor.exe	2010-07-19 12:47:46 +0000 differ
=== added file 'tools/dotNetInstaller/bin/InstallerLib.dll'
Binary files tools/dotNetInstaller/bin/InstallerLib.dll	1970-01-01 00:00:00 +0000 and tools/dotNetInstaller/bin/InstallerLib.dll	2010-07-19 12:47:46 +0000 differ
=== added file 'tools/dotNetInstaller/bin/InstallerLinker.exe'
Binary files tools/dotNetInstaller/bin/InstallerLinker.exe	1970-01-01 00:00:00 +0000 and tools/dotNetInstaller/bin/InstallerLinker.exe	2010-07-19 12:47:46 +0000 differ
=== added file 'tools/dotNetInstaller/bin/SourceGrid2.dll'
Binary files tools/dotNetInstaller/bin/SourceGrid2.dll	1970-01-01 00:00:00 +0000 and tools/dotNetInstaller/bin/SourceGrid2.dll	2010-07-19 12:47:46 +0000 differ
=== added file 'tools/dotNetInstaller/bin/SourceLibrary.dll'
Binary files tools/dotNetInstaller/bin/SourceLibrary.dll	1970-01-01 00:00:00 +0000 and tools/dotNetInstaller/bin/SourceLibrary.dll	2010-07-19 12:47:46 +0000 differ
=== added file 'tools/dotNetInstaller/bin/Vestris.ResourceLib.dll'
Binary files tools/dotNetInstaller/bin/Vestris.ResourceLib.dll	1970-01-01 00:00:00 +0000 and tools/dotNetInstaller/bin/Vestris.ResourceLib.dll	2010-07-19 12:47:46 +0000 differ
=== added file 'tools/dotNetInstaller/bin/dotNetInstaller.exe'
Binary files tools/dotNetInstaller/bin/dotNetInstaller.exe	1970-01-01 00:00:00 +0000 and tools/dotNetInstaller/bin/dotNetInstaller.exe	2010-07-19 12:47:46 +0000 differ
=== added file 'tools/dotNetInstaller/license.txt'
--- tools/dotNetInstaller/license.txt	1970-01-01 00:00:00 +0000
+++ tools/dotNetInstaller/license.txt	2010-07-19 12:47:46 +0000
@@ -0,0 +1,16 @@
+Copyright (c) 2009 Davide Icardi, Vestris Inc. and Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+software and associated documentation files (the "Software"), to deal in the Software 
+without restriction, including without limitation the rights to use, copy, modify, merge, 
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons 
+to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or 
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file