Merge lp:~mandel/ubuntuone-windows-installer/fix_gtk_installer into lp:ubuntuone-windows-installer/beta
- fix_gtk_installer
- Merge into beta
Status: | Merged |
---|---|
Approved by: | Manuel de la Peña |
Approved revision: | 15 |
Merge reported by: | Manuel de la Peña |
Merged at revision: | not available |
Proposed branch: | lp:~mandel/ubuntuone-windows-installer/fix_gtk_installer |
Merge into: | lp:ubuntuone-windows-installer/beta |
Diff against target: |
685 lines (+86/-495) 7 files modified
.bzrignore (+1/-0) README.txt (+8/-0) install/InstallerProject.xml (+46/-0) install/Tomboy.wxs (+0/-452) install/UbuntuOne.wxs (+0/-23) main.build (+15/-20) tools/dotNetInstaller/license.txt (+16/-0) |
To merge this branch: | bzr merge lp:~mandel/ubuntuone-windows-installer/fix_gtk_installer |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincenzo Di Somma (community) | Approve | ||
Stuart Colville (community) | Approve | ||
Review via email: mp+30249@code.launchpad.net |
Commit message
Description of the change
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\
tools\Nant\
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)
- 12. By Manuel de la Peña
-
Updates the README with information regarding the creating of the msi installer and the bootstrapper.
John Lenton (chipaca) wrote : | # |
- 13. By Manuel de la Peña
-
Fix typo in the dialog text.
Manuel de la Peña (mandel) wrote : | # |
> 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.
- 14. By Manuel de la Peña
-
Add missing dotNetInstaller bins
- 15. By Manuel de la Peña
-
The gtk installer shoul dbe executed before the tomboy one, otherwhise the installer will not be able to finish.
Stuart Colville (muffinresearch) wrote : | # |
Works as expected.
Vincenzo Di Somma (vds) wrote : | # |
Tests pass, installer builds, installer install/disinstall everything fine.
Preview Diff
1 | === modified file '.bzrignore' | |||
2 | --- .bzrignore 2010-07-15 08:24:53 +0000 | |||
3 | +++ .bzrignore 2010-07-19 12:47:46 +0000 | |||
4 | @@ -44,3 +44,4 @@ | |||
5 | 44 | UbuntuOne.wixobj | 44 | UbuntuOne.wixobj |
6 | 45 | UbuntuOne.wixpdb | 45 | UbuntuOne.wixpdb |
7 | 46 | tomboy | 46 | tomboy |
8 | 47 | setup.exe | ||
9 | 47 | 48 | ||
10 | === modified file 'README.txt' | |||
11 | --- README.txt 2010-07-13 15:47:22 +0000 | |||
12 | +++ README.txt 2010-07-19 12:47:46 +0000 | |||
13 | @@ -31,6 +31,14 @@ | |||
14 | 31 | 31 | ||
15 | 32 | 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 | 32 | 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 |
16 | 33 | root called "test-results". | 33 | root called "test-results". |
17 | 34 | |||
18 | 35 | 2.5 installer | ||
19 | 36 | |||
20 | 37 | Creates an msi installer that can be used to install Ubuntu One in a windows machine. | ||
21 | 38 | |||
22 | 39 | 2.6 bootstrapper | ||
23 | 40 | |||
24 | 41 | Crates a boot strapper that will allow to install a bundle with UbuntuOne that includes Tomboy and Gtk sharp if needed. | ||
25 | 34 | 42 | ||
26 | 35 | In order to execute the build script execute at the root of the project | 43 | In order to execute the build script execute at the root of the project |
27 | 36 | 44 | ||
28 | 37 | 45 | ||
29 | === added file 'install/InstallerProject.xml' | |||
30 | --- install/InstallerProject.xml 1970-01-01 00:00:00 +0000 | |||
31 | +++ install/InstallerProject.xml 2010-07-19 12:47:46 +0000 | |||
32 | @@ -0,0 +1,46 @@ | |||
33 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
34 | 2 | <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"> | ||
35 | 3 | <schema version="1.9.5931.0" generator="dotNetInstaller InstallerEditor" /> | ||
36 | 4 | <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"> | ||
37 | 5 | <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"> | ||
38 | 6 | <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" /> | ||
39 | 7 | <downloaddialog dialog_caption="Ubuntu One - Downloading Components" dialog_message="Press 'Start' to download the required components for installing "Ubuntu One"." 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"> | ||
40 | 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" /> | ||
41 | 9 | </downloaddialog> | ||
42 | 10 | </component> | ||
43 | 11 | <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"> | ||
44 | 12 | <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" /> | ||
45 | 13 | <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" /> | ||
46 | 14 | <downloaddialog dialog_caption="Gtk Sharp - Downloading Components" dialog_message="Press 'Start' to download the required components for installing "Gtk Sharp"." 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"> | ||
47 | 15 | <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" /> | ||
48 | 16 | </downloaddialog> | ||
49 | 17 | </component> | ||
50 | 18 | <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"> | ||
51 | 19 | <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" /> | ||
52 | 20 | <downloaddialog dialog_caption="Tomboy - Downloading Components" dialog_message="Press 'Start' to download the required components for installing "Tomboy"." 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"> | ||
53 | 21 | <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" /> | ||
54 | 22 | </downloaddialog> | ||
55 | 23 | </component> | ||
56 | 24 | </configuration> | ||
57 | 25 | <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"> | ||
58 | 26 | <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"> | ||
59 | 27 | <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" /> | ||
60 | 28 | <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"> | ||
61 | 29 | <download componentname="Download File" sourceurl="http://www.yourwebsite.com/SetupX/Setup.exe" sourcepath="" destinationpath="#TEMPPATH\APP_TEMP_DOWNLOADPATH" destinationfilename="" alwaysdownload="True" clear_cache="False" /> | ||
62 | 30 | </downloaddialog> | ||
63 | 31 | </component> | ||
64 | 32 | <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"> | ||
65 | 33 | <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" /> | ||
66 | 34 | <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"> | ||
67 | 35 | <download componentname="Download File" sourceurl="http://www.yourwebsite.com/SetupX/Setup.exe" sourcepath="" destinationpath="#TEMPPATH\APP_TEMP_DOWNLOADPATH" destinationfilename="" alwaysdownload="True" clear_cache="False" /> | ||
68 | 36 | </downloaddialog> | ||
69 | 37 | </component> | ||
70 | 38 | <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"> | ||
71 | 39 | <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" /> | ||
72 | 40 | <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" /> | ||
73 | 41 | <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"> | ||
74 | 42 | <download componentname="Download File" sourceurl="http://www.yourwebsite.com/SetupX/Setup.exe" sourcepath="" destinationpath="#TEMPPATH\APP_TEMP_DOWNLOADPATH" destinationfilename="" alwaysdownload="True" clear_cache="False" /> | ||
75 | 43 | </downloaddialog> | ||
76 | 44 | </component> | ||
77 | 45 | </configuration> | ||
78 | 46 | </configurations> | ||
79 | 0 | \ No newline at end of file | 47 | \ No newline at end of file |
80 | 1 | 48 | ||
81 | === removed file 'install/Tomboy.wxs' | |||
82 | --- install/Tomboy.wxs 2010-07-15 08:22:36 +0000 | |||
83 | +++ install/Tomboy.wxs 1970-01-01 00:00:00 +0000 | |||
84 | @@ -1,452 +0,0 @@ | |||
85 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
86 | 2 | <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | ||
87 | 3 | <Fragment Id="TomboyFragment"> | ||
88 | 4 | <DirectoryRef Id="TOMBOY_INSTALLDIR" > | ||
89 | 5 | <Component Id="TOMBOY_INSTALLDIR" | ||
90 | 6 | Guid="{D1F1C647-7D55-4AD2-B765-4152B337546E}"> | ||
91 | 7 | <RegistryKey Id="TomboyRegKey" | ||
92 | 8 | Action="createAndRemoveOnUninstall" | ||
93 | 9 | Key="Software\Tomboy" | ||
94 | 10 | Root="HKLM" /> | ||
95 | 11 | <RegistryValue Id="WriteTomboyTOMBOY_INSTALLDIR" | ||
96 | 12 | Root="HKLM" | ||
97 | 13 | Key="Software\Tomboy" | ||
98 | 14 | Name="TOMBOY_INSTALLDIR" | ||
99 | 15 | Value="[TOMBOY_INSTALLDIR]" | ||
100 | 16 | Type="string" | ||
101 | 17 | KeyPath="yes" /> | ||
102 | 18 | <RemoveFolder Id="TOMBOY_INSTALLDIR" | ||
103 | 19 | Directory="TOMBOY_INSTALLDIR" | ||
104 | 20 | On="uninstall" /> | ||
105 | 21 | </Component> | ||
106 | 22 | <Component Id="TomboyCore" | ||
107 | 23 | Guid="{01F111EB-3C6C-4E5B-8655-7922ED600DAC}"> | ||
108 | 24 | <File Id="Tomboy.exe" | ||
109 | 25 | Name="Tomboy.exe" | ||
110 | 26 | KeyPath="yes" | ||
111 | 27 | DiskId="1" | ||
112 | 28 | Source="tomboy\File\Tomboy.exe" /> | ||
113 | 29 | <File Id="LicenseFile" | ||
114 | 30 | Name="license.rtf" | ||
115 | 31 | DiskId="1" | ||
116 | 32 | Source="tomboy\File\LicenseFile" /> | ||
117 | 33 | <File Id="README" | ||
118 | 34 | Name="README" | ||
119 | 35 | DiskId="1" | ||
120 | 36 | Source="tomboy\File\README" /> | ||
121 | 37 | <File Id="COPYING" | ||
122 | 38 | Name="COPYING" | ||
123 | 39 | DiskId="1" | ||
124 | 40 | Source="tomboy\File\COPYING" /> | ||
125 | 41 | <File Id="NEWS" | ||
126 | 42 | Name="NEWS" | ||
127 | 43 | DiskId="1" | ||
128 | 44 | Source="tomboy\File\NEWS" /> | ||
129 | 45 | <File Id="AUTHORS" | ||
130 | 46 | Name="AUTHORS" | ||
131 | 47 | DiskId="1" | ||
132 | 48 | Source="tomboy\File\AUTHORS" /> | ||
133 | 49 | <File Id="Backlinks.dll" | ||
134 | 50 | Name="Backlinks.dll" | ||
135 | 51 | ShortName="hmtgksop.dll" | ||
136 | 52 | DiskId="1" | ||
137 | 53 | Source="tomboy\File\Backlinks.dll" /> | ||
138 | 54 | <File Id="Bugzilla.dll" | ||
139 | 55 | Name="Bugzilla.dll" | ||
140 | 56 | DiskId="1" | ||
141 | 57 | Source="tomboy\File\Bugzilla.dll" /> | ||
142 | 58 | <File Id="ExportToHtml.dll" | ||
143 | 59 | Name="ExportToHtml.dll" | ||
144 | 60 | ShortName="vygw-2yh.dll" | ||
145 | 61 | DiskId="1" | ||
146 | 62 | Source="tomboy\File\ExportToHtml.dll" /> | ||
147 | 63 | <File Id="ExportToHtml.xsl" | ||
148 | 64 | Name="ExportToHtml.xsl" | ||
149 | 65 | ShortName="g7ured_x.xsl" | ||
150 | 66 | DiskId="1" | ||
151 | 67 | Source="tomboy\File\ExportToHtml.xsl" /> | ||
152 | 68 | <File Id="FileSystemSyncService.dll" | ||
153 | 69 | Name="FileSystemSyncService.dll" | ||
154 | 70 | ShortName="oryuihs_.dll" | ||
155 | 71 | DiskId="1" | ||
156 | 72 | Source="tomboy\File\FileSystemSyncService.dll" /> | ||
157 | 73 | <File Id="FixedWidth.dll" | ||
158 | 74 | Name="FixedWidth.dll" | ||
159 | 75 | ShortName="-ce-ysdy.dll" | ||
160 | 76 | DiskId="1" | ||
161 | 77 | Source="tomboy\File\FixedWidth.dll" /> | ||
162 | 78 | <File Id="ICSharpCode.SharpZipLib.dll" | ||
163 | 79 | Name="ICSharpCode.SharpZipLib.dll" | ||
164 | 80 | ShortName="p6b88vwm.dll" | ||
165 | 81 | DiskId="1" | ||
166 | 82 | Source="tomboy\File\ICSharpCode.SharpZipLib.dll" /> | ||
167 | 83 | <File Id="InsertTimestamp.dll" | ||
168 | 84 | Name="InsertTimestamp.dll" | ||
169 | 85 | ShortName="bvnxamjb.dll" | ||
170 | 86 | DiskId="1" | ||
171 | 87 | Source="tomboy\File\InsertTimestamp.dll" /> | ||
172 | 88 | <File Id="Mono.Addins.dll" | ||
173 | 89 | Name="Mono.Addins.dll" | ||
174 | 90 | ShortName="pzlrnez_.dll" | ||
175 | 91 | DiskId="1" | ||
176 | 92 | Source="tomboy\File\Mono.Addins.dll" /> | ||
177 | 93 | <File Id="Mono.Addins.dll.config" | ||
178 | 94 | Name="Mono.Addins.dll.config" | ||
179 | 95 | ShortName="qrp80-s0.con" | ||
180 | 96 | DiskId="1" | ||
181 | 97 | Source="tomboy\File\Mono.Addins.dll.config" /> | ||
182 | 98 | <File Id="Mono.Addins.CecilReflector.dll" | ||
183 | 99 | Name="Mono.Addins.CecilReflector.dll" | ||
184 | 100 | ShortName="mdb0gs5g.dll" | ||
185 | 101 | DiskId="1" | ||
186 | 102 | Source="tomboy\File\Mono.Addins.CecilReflector.dll" /> | ||
187 | 103 | <File Id="Mono.Addins.Gui.dll" | ||
188 | 104 | Name="Mono.Addins.Gui.dll" | ||
189 | 105 | ShortName="pxkyupof.dll" | ||
190 | 106 | DiskId="1" | ||
191 | 107 | Source="tomboy\File\Mono.Addins.Gui.dll" /> | ||
192 | 108 | <File Id="Mono.Addins.Setup.dll" | ||
193 | 109 | Name="Mono.Addins.Setup.dll" | ||
194 | 110 | ShortName="tklrdv8o.dll" | ||
195 | 111 | DiskId="1" | ||
196 | 112 | Source="tomboy\File\Mono.Addins.Setup.dll" /> | ||
197 | 113 | <File Id="Mono.Posix.dll" | ||
198 | 114 | Name="Mono.Posix.dll" | ||
199 | 115 | ShortName="39t907ef.dll" | ||
200 | 116 | DiskId="1" | ||
201 | 117 | Source="tomboy\File\Mono.Posix.dll" /> | ||
202 | 118 | <File Id="MonoPosixHelper.dll" | ||
203 | 119 | Name="MonoPosixHelper.dll" | ||
204 | 120 | ShortName="7uuudfuk.dll" | ||
205 | 121 | DiskId="1" | ||
206 | 122 | Source="tomboy\File\MonoPosixHelper.dll" /> | ||
207 | 123 | <File Id="NoteDirectoryWatcher.dll" | ||
208 | 124 | Name="NoteDirectoryWatcher.dll" | ||
209 | 125 | ShortName="v4yyszyp.dll" | ||
210 | 126 | DiskId="1" | ||
211 | 127 | Source="tomboy\File\NoteDirectoryWatcher.dll" /> | ||
212 | 128 | <File Id="NoteOfTheDay.dll" | ||
213 | 129 | Name="NoteOfTheDay.dll" | ||
214 | 130 | ShortName="7-2c8ja7.dll" | ||
215 | 131 | DiskId="1" | ||
216 | 132 | Source="tomboy\File\NoteOfTheDay.dll" /> | ||
217 | 133 | <File Id="PrintNotes.dll" | ||
218 | 134 | Name="PrintNotes.dll" | ||
219 | 135 | ShortName="ddzyzxcj.dll" | ||
220 | 136 | DiskId="1" | ||
221 | 137 | Source="tomboy\File\PrintNotes.dll" /> | ||
222 | 138 | <File Id="Underline.dll" | ||
223 | 139 | Name="Underline.dll" | ||
224 | 140 | ShortName="ynxcthks.dll" | ||
225 | 141 | DiskId="1" | ||
226 | 142 | Source="tomboy\File\Underline.dll" /> | ||
227 | 143 | <File Id="WebSyncServiceAddin.dll" | ||
228 | 144 | Name="WebSyncServiceAddin.dll" | ||
229 | 145 | ShortName="buusdodu.dll" | ||
230 | 146 | DiskId="1" | ||
231 | 147 | Source="tomboy\File\WebSyncServiceAddin.dll" /> | ||
232 | 148 | <File Id="Backlinks.pdb" | ||
233 | 149 | Name="Backlinks.pdb" | ||
234 | 150 | ShortName="9boqbr1o.pdb" | ||
235 | 151 | DiskId="1" | ||
236 | 152 | Source="tomboy\File\Backlinks.pdb" /> | ||
237 | 153 | <File Id="Bugzilla.pdb" | ||
238 | 154 | Name="Bugzilla.pdb" | ||
239 | 155 | DiskId="1" | ||
240 | 156 | Source="tomboy\File\Bugzilla.pdb" /> | ||
241 | 157 | <File Id="ExportToHtml.pdb" | ||
242 | 158 | Name="ExportToHtml.pdb" | ||
243 | 159 | ShortName="ypwomz1a.pdb" | ||
244 | 160 | DiskId="1" | ||
245 | 161 | Source="tomboy\File\ExportToHtml.pdb" /> | ||
246 | 162 | <File Id="FileSystemSyncService.pdb" | ||
247 | 163 | Name="FileSystemSyncService.pdb" | ||
248 | 164 | ShortName="-1nszmgn.pdb" | ||
249 | 165 | DiskId="1" | ||
250 | 166 | Source="tomboy\File\FileSystemSyncService.pdb" /> | ||
251 | 167 | <File Id="FixedWidth.pdb" | ||
252 | 168 | Name="FixedWidth.pdb" | ||
253 | 169 | ShortName="ipkzwxsa.pdb" | ||
254 | 170 | DiskId="1" | ||
255 | 171 | Source="tomboy\File\FixedWidth.pdb" /> | ||
256 | 172 | <File Id="InsertTimestamp.pdb" | ||
257 | 173 | Name="InsertTimestamp.pdb" | ||
258 | 174 | ShortName="c4mzjbtr.pdb" | ||
259 | 175 | DiskId="1" | ||
260 | 176 | Source="tomboy\File\InsertTimestamp.pdb" /> | ||
261 | 177 | <File Id="NoteDirectoryWatcher.pdb" | ||
262 | 178 | Name="NoteDirectoryWatcher.pdb" | ||
263 | 179 | ShortName="gmshizle.pdb" | ||
264 | 180 | DiskId="1" | ||
265 | 181 | Source="tomboy\File\NoteDirectoryWatcher.pdb" /> | ||
266 | 182 | <File Id="NoteOfTheDay.pdb" | ||
267 | 183 | Name="NoteOfTheDay.pdb" | ||
268 | 184 | ShortName="bjgbecem.pdb" | ||
269 | 185 | DiskId="1" | ||
270 | 186 | Source="tomboy\File\NoteOfTheDay.pdb" /> | ||
271 | 187 | <File Id="PrintNotes.pdb" | ||
272 | 188 | Name="PrintNotes.pdb" | ||
273 | 189 | ShortName="nxkuyumx.pdb" | ||
274 | 190 | DiskId="1" | ||
275 | 191 | Source="tomboy\File\PrintNotes.pdb" /> | ||
276 | 192 | <File Id="Underline.pdb" | ||
277 | 193 | Name="Underline.pdb" | ||
278 | 194 | ShortName="7nz715zz.pdb" | ||
279 | 195 | DiskId="1" | ||
280 | 196 | Source="tomboy\File\Underline.pdb" /> | ||
281 | 197 | <File Id="WebSyncServiceAddin.pdb" | ||
282 | 198 | Name="WebSyncServiceAddin.pdb" | ||
283 | 199 | ShortName="dk8ufpsa.pdb" | ||
284 | 200 | DiskId="1" | ||
285 | 201 | Source="tomboy\File\WebSyncServiceAddin.pdb" /> | ||
286 | 202 | <File Id="Tomboy.pdb" | ||
287 | 203 | Name="Tomboy.pdb" | ||
288 | 204 | DiskId="1" | ||
289 | 205 | Source="tomboy\File\Tomboy.pdb" /> | ||
290 | 206 | <File Id="note.ico" | ||
291 | 207 | Name="note.ico" | ||
292 | 208 | DiskId="1" | ||
293 | 209 | Source="tomboy\File\note.ico" /> | ||
294 | 210 | <File Id="new_note.ico" | ||
295 | 211 | Name="new_note.ico" | ||
296 | 212 | DiskId="1" | ||
297 | 213 | Source="tomboy\File\new_note.ico" /> | ||
298 | 214 | <File Id="search.ico" | ||
299 | 215 | Name="search.ico" | ||
300 | 216 | DiskId="1" | ||
301 | 217 | Source="tomboy\File\search.ico" /> | ||
302 | 218 | <Shortcut Id="startmenuTomboy" | ||
303 | 219 | Directory="ProgramMenuFolder" | ||
304 | 220 | Name="Tomboy Notes" | ||
305 | 221 | ShortName="ncwoopnw" | ||
306 | 222 | Description="Tomboy Notes" | ||
307 | 223 | Icon="Tomboy.exe" | ||
308 | 224 | IconIndex="0" | ||
309 | 225 | WorkingDirectory="TOMBOY_INSTALLDIR" | ||
310 | 226 | Advertise="yes" /> | ||
311 | 227 | <Shortcut Id="desktopTomboy" | ||
312 | 228 | Directory="DesktopFolder" | ||
313 | 229 | Name="Tomboy Notes" | ||
314 | 230 | ShortName="nvwy6ted" | ||
315 | 231 | Description="Tomboy Notes" | ||
316 | 232 | Icon="Tomboy.exe" | ||
317 | 233 | IconIndex="0" | ||
318 | 234 | WorkingDirectory="TOMBOY_INSTALLDIR" | ||
319 | 235 | Advertise="yes" /> | ||
320 | 236 | </Component> | ||
321 | 237 | <Directory Id="tomboy" | ||
322 | 238 | Name="tomboy"> | ||
323 | 239 | <Directory Id="icons" | ||
324 | 240 | Name="icons"> | ||
325 | 241 | <Directory Id="hicolor" | ||
326 | 242 | Name="hicolor"> | ||
327 | 243 | <Directory Id="_6x16" | ||
328 | 244 | Name="16x16"> | ||
329 | 245 | <Directory Id="actions16" | ||
330 | 246 | Name="actions"> | ||
331 | 247 | <Component Id="Note_newPng" | ||
332 | 248 | Guid="{2F7685A9-DF0E-4471-9308-D3986E1E1A76}"> | ||
333 | 249 | <File Id="note_new.png" | ||
334 | 250 | Name="note-new.png" | ||
335 | 251 | KeyPath="yes" | ||
336 | 252 | DiskId="1" | ||
337 | 253 | Source="tomboy\File\note_new.png" /> | ||
338 | 254 | </Component> | ||
339 | 255 | </Directory> | ||
340 | 256 | <Directory Id="apps16" | ||
341 | 257 | Name="apps"> | ||
342 | 258 | <Component Id="TomboyPng" | ||
343 | 259 | Guid="{5765C385-C549-4976-8E32-0D9218B666B3}"> | ||
344 | 260 | <File Id="tomboy.png" | ||
345 | 261 | Name="tomboy.png" | ||
346 | 262 | KeyPath="yes" | ||
347 | 263 | DiskId="1" | ||
348 | 264 | Source="tomboy\File\tomboy.png" /> | ||
349 | 265 | </Component> | ||
350 | 266 | </Directory> | ||
351 | 267 | <Directory Id="status16" | ||
352 | 268 | Name="status"> | ||
353 | 269 | <Component Id="Pin_activePng" | ||
354 | 270 | Guid="{7DC80176-A1D9-4078-B09D-CA08D029728E}"> | ||
355 | 271 | <File Id="pin_active.png" | ||
356 | 272 | Name="pin-active.png" | ||
357 | 273 | KeyPath="yes" | ||
358 | 274 | ShortName="he3eol5w.png" | ||
359 | 275 | DiskId="1" | ||
360 | 276 | Source="tomboy\File\pin_active.png" /> | ||
361 | 277 | </Component> | ||
362 | 278 | <Component Id="Pin_downPng" | ||
363 | 279 | Guid="{03FEA52F-888F-43B1-9DE0-3934C88E8BF6}"> | ||
364 | 280 | <File Id="pin_down.png" | ||
365 | 281 | Name="pin-down.png" | ||
366 | 282 | KeyPath="yes" | ||
367 | 283 | DiskId="1" | ||
368 | 284 | Source="tomboy\File\pin_down.png" /> | ||
369 | 285 | </Component> | ||
370 | 286 | <Component Id="Pin_upPng" | ||
371 | 287 | Guid="{3EB31AAD-392C-4B25-BD29-178C829FFA3E}"> | ||
372 | 288 | <File Id="pin_up.png" | ||
373 | 289 | Name="pin-up.png" | ||
374 | 290 | KeyPath="yes" | ||
375 | 291 | DiskId="1" | ||
376 | 292 | Source="tomboy\File\pin_up.png" /> | ||
377 | 293 | </Component> | ||
378 | 294 | </Directory> | ||
379 | 295 | <Directory Id="places16" | ||
380 | 296 | Name="places" /> | ||
381 | 297 | </Directory> | ||
382 | 298 | <Directory Id="_2x22" | ||
383 | 299 | Name="22x22"> | ||
384 | 300 | <Directory Id="actions22" | ||
385 | 301 | Name="actions"> | ||
386 | 302 | <Component Id="Filter_note_allPng" | ||
387 | 303 | Guid="{EE1BA642-20A2-4CF1-9356-D174F32EA91B}"> | ||
388 | 304 | <File Id="filter_note_all.png" | ||
389 | 305 | Name="filter-note-all.png" | ||
390 | 306 | KeyPath="yes" | ||
391 | 307 | ShortName="zzbnlyvd.png" | ||
392 | 308 | DiskId="1" | ||
393 | 309 | Source="tomboy\File\filter_note_all.png" /> | ||
394 | 310 | </Component> | ||
395 | 311 | <Component Id="Filter_note_unfiledPng" | ||
396 | 312 | Guid="{48ED3CD0-FDF0-4A76-8609-1C6ACF436003}"> | ||
397 | 313 | <File Id="filter_note_unfiled.png" | ||
398 | 314 | Name="filter-note-unfiled.png" | ||
399 | 315 | KeyPath="yes" | ||
400 | 316 | ShortName="xlakxsn8.png" | ||
401 | 317 | DiskId="1" | ||
402 | 318 | Source="tomboy\File\filter_note_unfiled.png" /> | ||
403 | 319 | </Component> | ||
404 | 320 | </Directory> | ||
405 | 321 | <Directory Id="apps22" | ||
406 | 322 | Name="apps"> | ||
407 | 323 | <Component Id="AppsTomboyPng" | ||
408 | 324 | Guid="{23BD730D-537E-49C0-81B2-E687DD458B31}"> | ||
409 | 325 | <File Id="apps.tomboy.png" | ||
410 | 326 | Name="tomboy.png" | ||
411 | 327 | KeyPath="yes" | ||
412 | 328 | DiskId="1" | ||
413 | 329 | Source="tomboy\File\apps.tomboy.png" /> | ||
414 | 330 | </Component> | ||
415 | 331 | </Directory> | ||
416 | 332 | <Directory Id="places22" | ||
417 | 333 | Name="places"> | ||
418 | 334 | <Component Id="NotePng" | ||
419 | 335 | Guid="{A421B2BE-7618-484E-B79C-4A583395E847}"> | ||
420 | 336 | <File Id="note.png" | ||
421 | 337 | Name="note.png" | ||
422 | 338 | KeyPath="yes" | ||
423 | 339 | DiskId="1" | ||
424 | 340 | Source="tomboy\File\note.png" /> | ||
425 | 341 | </Component> | ||
426 | 342 | <Component Id="NotebookPng" | ||
427 | 343 | Guid="{6F91DF63-6D53-4ACF-AFFD-756A87108A74}"> | ||
428 | 344 | <File Id="notebook.png" | ||
429 | 345 | Name="notebook.png" | ||
430 | 346 | KeyPath="yes" | ||
431 | 347 | DiskId="1" | ||
432 | 348 | Source="tomboy\File\notebook.png" /> | ||
433 | 349 | </Component> | ||
434 | 350 | </Directory> | ||
435 | 351 | <Directory Id="status22" | ||
436 | 352 | Name="status" /> | ||
437 | 353 | </Directory> | ||
438 | 354 | <Directory Id="_4x24" | ||
439 | 355 | Name="24x24"> | ||
440 | 356 | <Directory Id="apps24" | ||
441 | 357 | Name="apps"> | ||
442 | 358 | <Component Id="AppsTomboyPng1" | ||
443 | 359 | Guid="{2EEEDADB-BFAB-486E-8A90-4FB849924813}"> | ||
444 | 360 | <File Id="apps.tomboy1.png" | ||
445 | 361 | Name="tomboy.png" | ||
446 | 362 | KeyPath="yes" | ||
447 | 363 | DiskId="1" | ||
448 | 364 | Source="tomboy\File\apps.tomboy1.png" /> | ||
449 | 365 | </Component> | ||
450 | 366 | </Directory> | ||
451 | 367 | <Directory Id="actions24" | ||
452 | 368 | Name="actions" /> | ||
453 | 369 | <Directory Id="places24" | ||
454 | 370 | Name="places" /> | ||
455 | 371 | <Directory Id="status24" | ||
456 | 372 | Name="status" /> | ||
457 | 373 | </Directory> | ||
458 | 374 | <Directory Id="_2x32" | ||
459 | 375 | Name="32x32"> | ||
460 | 376 | <Directory Id="apps32" | ||
461 | 377 | Name="apps"> | ||
462 | 378 | <Component Id="AppsTomboyPng2" | ||
463 | 379 | Guid="{7C4CA97A-AF77-452F-B848-9655BD322337}"> | ||
464 | 380 | <File Id="apps.tomboy2.png" | ||
465 | 381 | Name="tomboy.png" | ||
466 | 382 | KeyPath="yes" | ||
467 | 383 | DiskId="1" | ||
468 | 384 | Source="tomboy\File\apps.tomboy2.png" /> | ||
469 | 385 | </Component> | ||
470 | 386 | </Directory> | ||
471 | 387 | <Directory Id="actions32" | ||
472 | 388 | Name="actions" /> | ||
473 | 389 | <Directory Id="places32" | ||
474 | 390 | Name="places" /> | ||
475 | 391 | <Directory Id="status32" | ||
476 | 392 | Name="status" /> | ||
477 | 393 | </Directory> | ||
478 | 394 | <Directory Id="_8x48" | ||
479 | 395 | Name="48x48"> | ||
480 | 396 | <Directory Id="actions48" | ||
481 | 397 | Name="actions"> | ||
482 | 398 | <Component Id="Notebook_newPng" | ||
483 | 399 | Guid="{88DE93FC-41BD-456B-B3F9-2DFB6C9970F4}"> | ||
484 | 400 | <File Id="notebook_new.png" | ||
485 | 401 | Name="notebook-new.png" | ||
486 | 402 | KeyPath="yes" | ||
487 | 403 | ShortName="mnquckro.png" | ||
488 | 404 | DiskId="1" | ||
489 | 405 | Source="tomboy\File\notebook_new.png" /> | ||
490 | 406 | </Component> | ||
491 | 407 | </Directory> | ||
492 | 408 | <Directory Id="apps48" | ||
493 | 409 | Name="apps"> | ||
494 | 410 | <Component Id="AppsTomboyPng3" | ||
495 | 411 | Guid="{4B6E164C-E3E8-4B28-8FF4-2E48BA766A02}"> | ||
496 | 412 | <File Id="apps.tomboy3.png" | ||
497 | 413 | Name="tomboy.png" | ||
498 | 414 | KeyPath="yes" | ||
499 | 415 | DiskId="1" | ||
500 | 416 | Source="tomboy\File\apps.tomboy3.png" /> | ||
501 | 417 | </Component> | ||
502 | 418 | </Directory> | ||
503 | 419 | <Directory Id="places48" | ||
504 | 420 | Name="places" /> | ||
505 | 421 | <Directory Id="status48" | ||
506 | 422 | Name="status" /> | ||
507 | 423 | </Directory> | ||
508 | 424 | <Directory Id="scalable" | ||
509 | 425 | Name="scalable"> | ||
510 | 426 | <Directory Id="apps" | ||
511 | 427 | Name="apps"> | ||
512 | 428 | <Component Id="TomboySvg" | ||
513 | 429 | Guid="{ED86C52A-2B08-4E59-9702-156DB2601F9A}"> | ||
514 | 430 | <File Id="tomboy.svg" | ||
515 | 431 | Name="tomboy.svg" | ||
516 | 432 | KeyPath="yes" | ||
517 | 433 | DiskId="1" | ||
518 | 434 | Source="tomboy\File\tomboy.svg" /> | ||
519 | 435 | </Component> | ||
520 | 436 | </Directory> | ||
521 | 437 | <Directory Id="actions" | ||
522 | 438 | Name="actions" /> | ||
523 | 439 | <Directory Id="places" | ||
524 | 440 | Name="places" /> | ||
525 | 441 | <Directory Id="status" | ||
526 | 442 | Name="status" /> | ||
527 | 443 | </Directory> | ||
528 | 444 | </Directory> | ||
529 | 445 | </Directory> | ||
530 | 446 | </Directory> | ||
531 | 447 | </DirectoryRef> | ||
532 | 448 | <Icon Id="Tomboy.exe" | ||
533 | 449 | SourceFile="tomboy\Icon\Tomboy.exe" /> | ||
534 | 450 | |||
535 | 451 | </Fragment> | ||
536 | 452 | </Wix> | ||
537 | 453 | \ No newline at end of file | 0 | \ No newline at end of file |
538 | 454 | 1 | ||
539 | === modified file 'install/UbuntuOne.wxs' | |||
540 | --- install/UbuntuOne.wxs 2010-07-15 08:22:36 +0000 | |||
541 | +++ install/UbuntuOne.wxs 2010-07-19 12:47:46 +0000 | |||
542 | @@ -60,29 +60,6 @@ | |||
543 | 60 | Title="Ubuntu One" | 60 | Title="Ubuntu One" |
544 | 61 | Description="Ubuntu One is the personal cloud service that simplifies your digital life."> | 61 | Description="Ubuntu One is the personal cloud service that simplifies your digital life."> |
545 | 62 | </Feature> | 62 | </Feature> |
546 | 63 | <Feature Id="TomboyNotes" | ||
547 | 64 | ConfigurableDirectory="TOMBOY_INSTALLDIR" | ||
548 | 65 | Description="Take notes, link ideas, and stay organized." | ||
549 | 66 | Level="1" | ||
550 | 67 | Title="Tomboy Notes"> | ||
551 | 68 | <ComponentRef Id="TOMBOY_INSTALLDIR" /> | ||
552 | 69 | <ComponentRef Id="TomboyCore" Primary="yes" /> | ||
553 | 70 | <ComponentRef Id="Note_newPng" /> | ||
554 | 71 | <ComponentRef Id="TomboyPng" /> | ||
555 | 72 | <ComponentRef Id="Pin_activePng" /> | ||
556 | 73 | <ComponentRef Id="Pin_downPng" /> | ||
557 | 74 | <ComponentRef Id="Pin_upPng" /> | ||
558 | 75 | <ComponentRef Id="Filter_note_allPng" /> | ||
559 | 76 | <ComponentRef Id="Filter_note_unfiledPng" /> | ||
560 | 77 | <ComponentRef Id="AppsTomboyPng" /> | ||
561 | 78 | <ComponentRef Id="NotePng" /> | ||
562 | 79 | <ComponentRef Id="NotebookPng" /> | ||
563 | 80 | <ComponentRef Id="AppsTomboyPng1" /> | ||
564 | 81 | <ComponentRef Id="AppsTomboyPng2" /> | ||
565 | 82 | <ComponentRef Id="Notebook_newPng" /> | ||
566 | 83 | <ComponentRef Id="AppsTomboyPng3" /> | ||
567 | 84 | <ComponentRef Id="TomboySvg" /> | ||
568 | 85 | </Feature> | ||
569 | 86 | 63 | ||
570 | 87 | <!-- Provide the UI extensions to be used --> | 64 | <!-- Provide the UI extensions to be used --> |
571 | 88 | <UIRef Id="WixUI_Mondo" /> | 65 | <UIRef Id="WixUI_Mondo" /> |
572 | 89 | 66 | ||
573 | === added file 'install/dotNetInstaller.exe' | |||
574 | 90 | Binary files install/dotNetInstaller.exe 1970-01-01 00:00:00 +0000 and install/dotNetInstaller.exe 2010-07-19 12:47:46 +0000 differ | 67 | Binary files install/dotNetInstaller.exe 1970-01-01 00:00:00 +0000 and install/dotNetInstaller.exe 2010-07-19 12:47:46 +0000 differ |
575 | === modified file 'main.build' | |||
576 | --- main.build 2010-07-15 08:23:04 +0000 | |||
577 | +++ main.build 2010-07-19 12:47:46 +0000 | |||
578 | @@ -3,9 +3,6 @@ | |||
579 | 3 | <!-- the enviroment property allows to select which enviroment we are compiling to --> | 3 | <!-- the enviroment property allows to select which enviroment we are compiling to --> |
580 | 4 | <property name="enviroment" value="debug" /> | 4 | <property name="enviroment" value="debug" /> |
581 | 5 | 5 | ||
582 | 6 | <!-- TODO: make this in a u1 server --> | ||
583 | 7 | <property name="tomboy_sorces" value="http://download.gnome.org/binaries/win32/tomboy/1.2/Tomboy-1.2.2.msi" /> | ||
584 | 8 | |||
585 | 9 | <!-- Please provide the path where the Wix binaries are located. --> | 6 | <!-- Please provide the path where the Wix binaries are located. --> |
586 | 10 | <property name="wix_path" value="C:\Program Files\Windows Installer XML v3\bin" /> | 7 | <property name="wix_path" value="C:\Program Files\Windows Installer XML v3\bin" /> |
587 | 11 | 8 | ||
588 | @@ -112,20 +109,6 @@ | |||
589 | 112 | 109 | ||
590 | 113 | </target> | 110 | </target> |
591 | 114 | 111 | ||
592 | 115 | <target name="tomboy" | ||
593 | 116 | description="Downloads the msi of tomboy a decompiles it in order to create a merge msi."> | ||
594 | 117 | |||
595 | 118 | <get src="${tomboy_sorces}" dest="tomboy.msi" unless="${file::exists('tomboy.msi')}"/> | ||
596 | 119 | |||
597 | 120 | <!-- use dark against tomboy --> | ||
598 | 121 | <exec basedir="${wix_path}" | ||
599 | 122 | useruntimeengine="true" | ||
600 | 123 | workingdir="." | ||
601 | 124 | program="dark.exe" | ||
602 | 125 | commandline="tomboy.msi -x install/tomboy" | ||
603 | 126 | unless="${directory::exists('install/tomboy')}"/> | ||
604 | 127 | </target> | ||
605 | 128 | |||
606 | 129 | <target name="build" | 112 | <target name="build" |
607 | 130 | description="Compiles all the different projects that form part of the solution." | 113 | description="Compiles all the different projects that form part of the solution." |
608 | 131 | depends="clean, generate_protos"> | 114 | depends="clean, generate_protos"> |
609 | @@ -160,20 +143,32 @@ | |||
610 | 160 | 143 | ||
611 | 161 | <target name="installer" | 144 | <target name="installer" |
612 | 162 | description="Compiles the solution and create a merge installer that allows to install the solution and other related apps." | 145 | description="Compiles the solution and create a merge installer that allows to install the solution and other related apps." |
614 | 163 | depends="build, tomboy"> | 146 | depends="build"> |
615 | 164 | 147 | ||
616 | 165 | <!-- wix compiler --> | 148 | <!-- wix compiler --> |
617 | 166 | <exec basedir="${wix_path}" | 149 | <exec basedir="${wix_path}" |
618 | 167 | useruntimeengine="true" | 150 | useruntimeengine="true" |
619 | 168 | workingdir="install" | 151 | workingdir="install" |
620 | 169 | program="candle.exe" | 152 | program="candle.exe" |
622 | 170 | commandline="Tomboy.wxs UbuntuOne.wxs"/> | 153 | commandline=" UbuntuOne.wxs"/> |
623 | 171 | 154 | ||
624 | 172 | <!-- wix linker --> | 155 | <!-- wix linker --> |
625 | 173 | <exec basedir="${wix_path}" | 156 | <exec basedir="${wix_path}" |
626 | 174 | useruntimeengine="true" | 157 | useruntimeengine="true" |
627 | 175 | workingdir="install" | 158 | workingdir="install" |
628 | 176 | program="light.exe" | 159 | program="light.exe" |
630 | 177 | commandline="-out UbuntuOne.msi -ext WixUIExtension Tomboy.wixobj UbuntuOne.wixobj"/> | 160 | commandline="-out UbuntuOne.msi -ext WixUIExtension UbuntuOne.wixobj"/> |
631 | 161 | |||
632 | 162 | |||
633 | 163 | </target> | ||
634 | 164 | |||
635 | 165 | <target name="bootstrapper" | ||
636 | 166 | description="Creates a bootstrapper that will allow to install Ubuntu One, Tomboy and Gtk Sharp in the users machine."> | ||
637 | 167 | |||
638 | 168 | <exec basedir="tools/dotNetInstaller/bin" | ||
639 | 169 | useruntimeengine="true" | ||
640 | 170 | workingdir="install" | ||
641 | 171 | program="InstallerLinker.exe" | ||
642 | 172 | commandline="/Output:setup.exe /Template:dotNetInstaller.exe /Configuration:InstallerProject.xml /Embed+" /> | ||
643 | 178 | </target> | 173 | </target> |
644 | 179 | </project> | 174 | </project> |
645 | 180 | \ No newline at end of file | 175 | \ No newline at end of file |
646 | 181 | 176 | ||
647 | === added directory 'tools/dotNetInstaller' | |||
648 | === added directory 'tools/dotNetInstaller/bin' | |||
649 | === added file 'tools/dotNetInstaller/bin/CabLib.dll' | |||
650 | 182 | 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 | 177 | 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 |
651 | === added file 'tools/dotNetInstaller/bin/InstallerEditor.exe' | |||
652 | 183 | 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 | 178 | 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 |
653 | === added file 'tools/dotNetInstaller/bin/InstallerLib.dll' | |||
654 | 184 | 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 | 179 | 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 |
655 | === added file 'tools/dotNetInstaller/bin/InstallerLinker.exe' | |||
656 | 185 | 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 | 180 | 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 |
657 | === added file 'tools/dotNetInstaller/bin/SourceGrid2.dll' | |||
658 | 186 | 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 | 181 | 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 |
659 | === added file 'tools/dotNetInstaller/bin/SourceLibrary.dll' | |||
660 | 187 | 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 | 182 | 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 |
661 | === added file 'tools/dotNetInstaller/bin/Vestris.ResourceLib.dll' | |||
662 | 188 | 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 | 183 | 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 |
663 | === added file 'tools/dotNetInstaller/bin/dotNetInstaller.exe' | |||
664 | 189 | 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 | 184 | 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 |
665 | === added file 'tools/dotNetInstaller/license.txt' | |||
666 | --- tools/dotNetInstaller/license.txt 1970-01-01 00:00:00 +0000 | |||
667 | +++ tools/dotNetInstaller/license.txt 2010-07-19 12:47:46 +0000 | |||
668 | @@ -0,0 +1,16 @@ | |||
669 | 1 | Copyright (c) 2009 Davide Icardi, Vestris Inc. and Contributors | ||
670 | 2 | |||
671 | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy of this | ||
672 | 4 | software and associated documentation files (the "Software"), to deal in the Software | ||
673 | 5 | without restriction, including without limitation the rights to use, copy, modify, merge, | ||
674 | 6 | publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons | ||
675 | 7 | to whom the Software is furnished to do so, subject to the following conditions: | ||
676 | 8 | |||
677 | 9 | The above copyright notice and this permission notice shall be included in all copies or | ||
678 | 10 | substantial portions of the Software. | ||
679 | 11 | |||
680 | 12 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, | ||
681 | 13 | INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR | ||
682 | 14 | PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE | ||
683 | 15 | FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
684 | 16 | ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
685 | 0 | \ No newline at end of file | 17 | \ No newline at end of file |
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”