Ubuntu One Windows Installer

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

  1. add_client_installer
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Vincenzo Di Somma
Approved revision: 29
Merged at revision: 53
Proposed branch: lp:~mandel/ubuntuone-windows-installer/add_client_installer
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/sandcastle
Diff against target: 277 lines (+222/-2)
2 files modified
install/UbuntuOne.wxs (+196/-2)
main.build (+26/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/add_client_installer
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+31732@code.launchpad.net

Description of the change

Updates the build script and the installer to ensure that the msi will install the client of the daemon in the users machine as well as registering it to be started at boot time.

To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

There is a small typo on UBUNTUONECLIETN_START_VIA_REGISTRY, the T
should be after the N.

lp:~mandel/ubuntuone-windows-installer/add_client_installer updated
26. By Manuel de la Peña

Merge with parent.

Revision history for this message
Manuel de la Peña (mandel) wrote :

> There is a small typo on UBUNTUONECLIETN_START_VIA_REGISTRY, the T
> should be after the N.

Sorted, thx!

lp:~mandel/ubuntuone-windows-installer/add_client_installer updated
27. By Manuel de la Peña

Typo

Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve
lp:~mandel/ubuntuone-windows-installer/add_client_installer updated
28. By Manuel de la Peña

Merge with parent

29. By Manuel de la Peña

Merge with parent.

Revision history for this message
Vincenzo Di Somma (vds) wrote :

Builds, tests, installs, uninstalls.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install/UbuntuOne.wxs'
2--- install/UbuntuOne.wxs 2010-07-26 16:16:54 +0000
3+++ install/UbuntuOne.wxs 2010-08-10 10:06:00 +0000
4@@ -32,6 +32,8 @@
5 Cabinet="UbuntuOne.cab"
6 EmbedCab="yes" />
7
8+ <Property Id="UBUNTUONECLIENT_START_VIA_REGISTRY">1</Property>
9+
10 <Directory Id="TARGETDIR"
11 Name="SourceDir">
12 <Directory Id="ProgramMenuFolder"
13@@ -118,7 +120,7 @@
14 Source="build_results\Daemon\Common.Logging.Log4Net.dll"
15 KeyPath="yes"/>
16 </Component>
17- <Component Id="DotUpdaterComponent"
18+ <Component Id="DotUpdaterLib"
19 Guid="af217c90-967d-11df-981c-0800200c9a66">
20 <File Id="DotUpdater.dll"
21 Name="DotUpdater.dll"
22@@ -242,6 +244,175 @@
23 </Component>
24 </Directory>
25 </Directory>
26+ <Directory Id="ClientDir"
27+ Name="Client">
28+ <!-- Auto-start via Registry -->
29+ <Component Id="UbuntuOneClietnAutostart"
30+ Guid="e3b224c0-9fa4-11df-981c-0800200c9a66">
31+ <RegistryValue Id="UbunntuOneClient.rst"
32+ Root="HKCU"
33+ Key="Software\Microsoft\Windows\CurrentVersion\Run"
34+ Name="Ubuntu One Client"
35+ Value="[ClientDir]UbuntuOneClient.exe"
36+ Type="string"/>
37+ <Condition>UBUNTUONECLIENT_START_VIA_REGISTRY</Condition>
38+ </Component>
39+ <Component Id="AvalonLib"
40+ Guid="99106520-9f9b-11df-981c-0800200c9a66">
41+ <File Id="AvalonLibrary.dll"
42+ Name="AvalonLibrary.dll"
43+ DiskId="1"
44+ Source="build_results\Client\AvalonLibrary.dll"
45+ KeyPath="yes"/>
46+ </Component>
47+ <Component Id="UbuntuOneClientLib"
48+ Guid="98ceabc0-9f9c-11df-981c-0800200c9a66">
49+ <File Id="Canonical.UbuntuOne.Client.dll"
50+ Name="Canonical.UbuntuOne.Client.dll"
51+ DiskId="1"
52+ Source="build_results\Client\Canonical.UbuntuOne.Client.dll"
53+ KeyPath="yes"/>
54+ </Component>
55+ <Component Id="UbuntuOneClientLibPdb"
56+ Guid="af68a6b0-9f9c-11df-981c-0800200c9a66">
57+ <File Id="Canonical.UbuntuOne.Client.pdb"
58+ Name="Canonical.UbuntuOne.Client.pdb"
59+ DiskId="1"
60+ Source="build_results\Client\Canonical.UbuntuOne.Client.pdb"
61+ KeyPath="yes"/>
62+ </Component>
63+ <Component Id="UbuntuOneClientViewsLib"
64+ Guid="ae68f9e0-9fb0-11df-981c-0800200c9a66">
65+ <File Id="Canonical.UbuntuOne.Client.Views.dll"
66+ Name="Canonical.UbuntuOne.Client.Views.dll"
67+ DiskId="1"
68+ Source="build_results\Client\Canonical.UbuntuOne.Client.Views.dll"
69+ KeyPath="yes"/>
70+ </Component>
71+ <Component Id="UbuntuOneClientViewsLibPdb"
72+ Guid="b4d54360-9fb0-11df-981c-0800200c9a66">
73+ <File Id="Canonical.UbuntuOne.Client.Views.pdb"
74+ Name="Canonical.UbuntuOne.Client.Views.pdb"
75+ DiskId="1"
76+ Source="build_results\Client\Canonical.UbuntuOne.Client.Views.pdb"
77+ KeyPath="yes"/>
78+ </Component>
79+ <Component Id="UbuntuOneCommonLib"
80+ Guid="cadc1620-9f9c-11df-981c-0800200c9a66">
81+ <File Id="Canonical.UbuntuOne.Common.dll_client"
82+ Name="Canonical.UbuntuOne.Common.dll"
83+ DiskId="1"
84+ Source="build_results\Client\Canonical.UbuntuOne.Common.dll"
85+ KeyPath="yes"/>
86+ </Component>
87+ <Component Id="UbuntuOneCommonLibPdb"
88+ Guid="eca5af00-9f9c-11df-981c-0800200c9a66">
89+ <File Id="Canonical.UbuntuOne.Common.pdb_client"
90+ Name="Canonical.UbuntuOne.Common.pdb"
91+ DiskId="1"
92+ Source="build_results\Client\Canonical.UbuntuOne.Common.pdb"
93+ KeyPath="yes"/>
94+ </Component>
95+ <Component Id="CommonLoggingComponentClient"
96+ Guid="12de88e0-9f9d-11df-981c-0800200c9a66">
97+ <File Id="Common.Logging.dll_client"
98+ Name="Common.Logging.dll"
99+ DiskId="1"
100+ Source="build_results\Client\Common.Logging.dll"
101+ KeyPath="yes"/>
102+ </Component>
103+ <Component Id="CommonLoggingLog4NetComponentClient"
104+ Guid="1a06f670-9f9d-11df-981c-0800200c9a66">
105+ <File Id="Common.Logging.Log4Net.dll_client"
106+ Name="Common.Logging.Log4Net.dll"
107+ DiskId="1"
108+ Source="build_results\Client\Common.Logging.Log4Net.dll"
109+ KeyPath="yes"/>
110+ </Component>
111+ <Component Id="DotUpdaterLibClient"
112+ Guid="31a4a5c0-9f9d-11df-981c-0800200c9a66">
113+ <File Id="DotUpdater.dll_client"
114+ Name="DotUpdater.dll"
115+ DiskId="1"
116+ Source="build_results\Client\DotUpdater.dll"
117+ KeyPath="yes"/>
118+ </Component>
119+ <Component Id="Log4NetComponentClient"
120+ Guid="5d2630b0-9f9d-11df-981c-0800200c9a66">
121+ <File Id="log4net.dll_client"
122+ Name="log4net.dll"
123+ DiskId="1"
124+ Source="build_results\Client\log4net.dll"
125+ KeyPath="yes"/>
126+ </Component>
127+ <Component Id="SpringAopComponentClient"
128+ Guid="8fbaf380-9f9d-11df-981c-0800200c9a66">
129+ <File Id="Spring.Aop.dll_client"
130+ Name="Spring.Aop.dll"
131+ DiskId="1"
132+ Source="build_results\Client\Spring.Aop.dll"
133+ KeyPath="yes"/>
134+ </Component>
135+ <Component Id="SpringAopConfigComponentClient"
136+ Guid="94fffb10-9f9d-11df-981c-0800200c9a66">
137+ <File Id="Spring.Aop.xml_client"
138+ Name="Spring.Aop.xml"
139+ DiskId="1"
140+ Source="build_results\Client\Spring.Aop.xml"
141+ KeyPath="yes"/>
142+ </Component>
143+ <Component Id="SpringCoreComponentClient"
144+ Guid="9a6a16d0-9f9d-11df-981c-0800200c9a66">
145+ <File Id="Spring.Core.dll_client"
146+ Name="Spring.Core.dll"
147+ DiskId="1"
148+ Source="build_results\Client\Spring.Core.dll"
149+ KeyPath="yes"/>
150+ </Component>
151+ <Component Id="SpringCoreConfigComponentClient"
152+ Guid="9fa7cb60-9f9d-11df-981c-0800200c9a66">
153+ <File Id="Spring.Core.xml_client"
154+ Name="Spring.Core.xml"
155+ DiskId="1"
156+ Source="build_results\Client\Spring.Core.xml"
157+ KeyPath="yes"/>
158+ </Component>
159+ <Component Id="UbuntuOneClient"
160+ Guid="bb893ee0-9f9d-11df-981c-0800200c9a66">
161+ <File Id="UbuntuOneClient.exe"
162+ Name="UbuntuOneClient.exe"
163+ DiskId="1"
164+ Source="build_results\Client\UbuntuOneClient.exe"
165+ KeyPath="yes"/>
166+ </Component>
167+ <Component Id="UbuntuOneClientConfig"
168+ Guid="da9e3f10-9f9d-11df-981c-0800200c9a66">
169+ <File Id="UbuntuOneClient.exe.config"
170+ Name="UbuntuOneClient.exe.config"
171+ DiskId="1"
172+ Source="build_results\Client\UbuntuOneClient.exe.config"
173+ KeyPath="yes"/>
174+ </Component>
175+ <Component Id="UbuntuOneClientPdb"
176+ Guid="fad020f0-9f9d-11df-981c-0800200c9a66">
177+ <File Id="UbuntuOneClient.pdb"
178+ Name="UbuntuOneClient.pdb"
179+ DiskId="1"
180+ Source="build_results\Client\UbuntuOneClient.pdb"
181+ KeyPath="yes"/>
182+ </Component>
183+ <Directory Id="ClientConfigDir"
184+ Name="Config">
185+ <Component Id="ClientConfigLog4Net"
186+ Guid="40cf49a0-9f9e-11df-981c-0800200c9a66">
187+ <File Id="log4net.config_client"
188+ Name="log4net.config"
189+ DiskId="1"
190+ Source="build_results\Client\Config\log4net.config"
191+ KeyPath="yes"/>
192+ </Component>
193+ </Directory>
194+ </Directory>
195 </Directory>
196 </Directory>
197 </Directory>
198@@ -252,11 +423,12 @@
199 Level="1"
200 Title="Ubuntu One"
201 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">
202+ <!-- Daemon components -->
203 <ComponentRef Id="DaemonCommonLibComponent" />
204 <ComponentRef Id="DaemonCommonPdbComponent" />
205 <ComponentRef Id="CommonLoggingComponent" />
206 <ComponentRef Id="CommonLoggingLog4NetComponent" />
207- <ComponentRef Id="DotUpdaterComponent" />
208+ <ComponentRef Id="DotUpdaterLib" />
209 <ComponentRef Id="Log4NetComponent" />
210 <ComponentRef Id="ProtobufNetComponent" />
211 <ComponentRef Id="ProtobufPdbComponent" />
212@@ -274,6 +446,28 @@
213 <ComponentRef Id="ServiceModelBehavioursConfig" />
214 <ComponentRef Id="ServiceModelBindingsConfig" />
215 <ComponentRef Id="ServiceModelServicesConfig" />
216+ <!-- Client components -->
217+ <ComponentRef Id="AvalonLib" />
218+ <ComponentRef Id="UbuntuOneClientLib" />
219+ <ComponentRef Id="UbuntuOneClientLibPdb" />
220+ <ComponentRef Id="UbuntuOneClientViewsLib" />
221+ <ComponentRef Id="UbuntuOneClientViewsLibPdb" />
222+ <ComponentRef Id="UbuntuOneCommonLib" />
223+ <ComponentRef Id="UbuntuOneCommonLibPdb" />
224+ <ComponentRef Id="CommonLoggingComponentClient" />
225+ <ComponentRef Id="CommonLoggingLog4NetComponentClient" />
226+ <ComponentRef Id="DotUpdaterLibClient" />
227+ <ComponentRef Id="Log4NetComponentClient" />
228+ <ComponentRef Id="SpringAopComponentClient" />
229+ <ComponentRef Id="SpringAopConfigComponentClient" />
230+ <ComponentRef Id="SpringCoreComponentClient" />
231+ <ComponentRef Id="SpringCoreConfigComponentClient" />
232+ <ComponentRef Id="UbuntuOneClient" />
233+ <ComponentRef Id="UbuntuOneClientConfig" />
234+ <ComponentRef Id="UbuntuOneClientPdb" />
235+ <ComponentRef Id="ClientConfigLog4Net" />
236+ <!-- Client auto start -->
237+ <ComponentRef Id="UbuntuOneClietnAutostart" />
238 </Feature>
239
240 <!-- Provide the UI extensions to be used -->
241
242=== modified file 'main.build'
243--- main.build 2010-08-10 10:06:00 +0000
244+++ main.build 2010-08-10 10:06:00 +0000
245@@ -226,6 +226,32 @@
246 <include name="*.config" />
247 </fileset>
248 </copy>
249+
250+ <copy todir="${build_results}/Client" flatten="true">
251+ <fileset basedir="src/UbuntuOneClient/bin/${enviroment}">
252+ <include name="*.dll" />
253+ <include name="*.pdb" />
254+ <include name="*.xml" />
255+ <include name="*.config" />
256+ <include name="*.exe" />
257+ </fileset>
258+ </copy>
259+
260+ <copy todir="${build_results}/Client/Config" flatten="true">
261+ <fileset basedir="src/UbuntuOneClient/bin/${enviroment}/Config">
262+ <include name="*.config" />
263+ </fileset>
264+ </copy>
265+
266+ <!-- copy the correct views lib -->
267+
268+ <copy todir="${build_results}/Client" flatten="true">
269+ <fileset basedir="src/Canonical.UbuntuOne.Client.Views/bin/${enviroment}">
270+ <include name="Canonical.UbuntuOne.Client.Views.dll" />
271+ <include name="Canonical.UbuntuOne.Client.Views.pdb" />
272+ </fileset>
273+ </copy>
274+
275 <!-- wix compiler -->
276 <exec basedir="tools/Wix/bin"
277 managed="true"

Subscribers

People subscribed via source and target branches

to all changes: