Ubuntu One Windows Installer

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

  1. install_service_wix
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Rodrigo Moya
Approved revision: 17
Merged at revision: 40
Proposed branch: lp:~mandel/ubuntuone-windows-installer/install_service_wix
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/fix_null_pointer_start
Diff against target: 304 lines (+188/-35)
2 files modified
install/UbuntuOne.wxs (+170/-29)
main.build (+18/-6)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/install_service_wix
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
Vincenzo Di Somma (community) Approve
Review via email: mp+30685@code.launchpad.net

Description of the change

This branch creates an installer that will install and set up the windows service in the users machine. This means that after the UbuntuOne.msi has been executed the user will have the following:

1. The daemon installed in his machine (Default path is: Program Files/Canonical/Ubuntu One/Daemon
2. Ubuntu One Sync Daemon is one of the installed an running services in the machine (mmc.exe can be used to check this or adminstrative tools -> services)

To test the branch call:

tools\Nant\bin\nant.exe installer

Then in the install directory execute UbuntuOne.msi and install the daemon. After the installation the previously mentioned features should be present.

To post a comment you must log in.
Revision history for this message
Vincenzo Di Somma (vds) wrote :

Tests are ok, installs, disinstall so +1...

review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Can't see anything wrong

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'install/UbuntuOne.wxs'
--- install/UbuntuOne.wxs 2010-07-19 10:10:22 +0000
+++ install/UbuntuOne.wxs 2010-07-22 17:01:47 +0000
@@ -1,36 +1,39 @@
1<?xml version='1.0' encoding='windows-1252'?>1<?xml version="1.0" encoding="windows-1252"?>
2<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>2<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
3<!-- 3<!--
4This file contains the wix installer definition that will be used to install Ubuntu One4This file contains the wix installer definition that will be used to install Ubuntu One
5on windows machines. The installer ensures that all the required dependencies that the 5on windows machines. The installer ensures that all the required dependencies that the
6application requires are present in the system allowing the user to forget about dependecies6application requires are present in the system allowing the user to forget about dependecies
7-->7-->
8 <Product Name='Ubuntu One' 8 <Product Name="Ubuntu One"
9 Id='13b7ee30-849c-11df-8395-0800200c9a66' 9 Id="13b7ee30-849c-11df-8395-0800200c9a66"
10 UpgradeCode='1f5dcd90-849c-11df-8395-0800200c9a66'10 UpgradeCode="1f5dcd90-849c-11df-8395-0800200c9a66"
11 Language='1033' 11 Language="1033"
12 Codepage='1252' 12 Codepage="1252"
13 Version='1.0.0' 13 Version="1.0.0"
14 Manufacturer='Canonical Ltd.'>14 Manufacturer="Canonical Ltd.">
15 15
16 <Package Id='*' 16 <Package Id="*"
17 Keywords='Installer' 17 Keywords="Installer"
18 Description="Ubuntu One is the personal cloud service that 18 Description="Ubuntu One is the personal cloud service that
19 simplifies your digital life. Imagine buying music and getting 19 simplifies your digital life. Imagine buying music and getting
20 it delivered to the computers of your choice. Or synchronizing your 20 it delivered to the computers of your choice. Or synchronizing your
21 files and notes and accessing them from anywhere. 21 files and notes and accessing them from anywhere.
22 Or consolidating your computer and mobile phone contacts and safely 22 Or consolidating your computer and mobile phone contacts and safely
23 sharing documents and pictures with them"23 sharing documents and pictures with them"
24 Comments='UbuntuOne is a registered trademark of Canonical Ltd.' 24 Comments="UbuntuOne is a registered trademark of Canonical Ltd."
25 Manufacturer='Canonical Ltd.'25 Manufacturer="Canonical Ltd."
26 InstallerVersion='100' 26 InstallerVersion="350"
27 Languages='1033' 27 Languages="1033"
28 Compressed='yes' 28 Compressed="yes"
29 SummaryCodepage='1252' />29 SummaryCodepage="1252" />
30 30
31 <Media Id='1' 31 <Media Id="1"
32 Cabinet='UbuntuOne.cab' 32 Cabinet="UbuntuOne.cab"
33 EmbedCab='yes' />33 EmbedCab="yes" />
34
35 <Property Id="SERVICECREDENTIALS_USERLOGIN" />
36 <Property Id="SERVICECREDENTIALS_PASSWORD" />
34 37
35 <Directory Id="TARGETDIR" 38 <Directory Id="TARGETDIR"
36 Name="SourceDir">39 Name="SourceDir">
@@ -39,18 +42,144 @@
39 <Directory Id="DesktopFolder" 42 <Directory Id="DesktopFolder"
40 Name="Desktop" />43 Name="Desktop" />
41 <Directory Id="ProgramFilesFolder" 44 <Directory Id="ProgramFilesFolder"
42 Name='PFiles'> 45 Name="PFiles">
43 <Directory Id="Canonical" 46 <Directory Id="Canonical"
44 Name="Canonical">47 Name="Canonical">
45 <Directory Id="U1Installdir" 48 <Directory Id="U1Installdir"
46 Name="UbuntuOne">49 Name="UbuntuOne">
47 50 <Directory Id="DaemonDir"
51 Name="Daemon">
52 <Component Id="DaemonCommonLibComponent"
53 Guid="a609b650-94b5-11df-981c-0800200c9a66">
54 <File Id="Canonical.UbuntuOne.Common.dll"
55 Name="Canonical.UbuntuOne.Common.dll"
56 DiskId="1"
57 Source="build_results\Daemon\Canonical.UbuntuOne.Common.dll"
58 KeyPath="yes"/>
59 </Component>
60 <Component Id="DaemonCommonPdbComponent"
61 Guid="c4ddb5e0-94b5-11df-981c-0800200c9a66">
62 <File Id="Canonical.UbuntuOne.Common.pdb"
63 Name="Canonical.UbuntuOne.Common.pdb"
64 DiskId="1"
65 Source="build_results\Daemon\Canonical.UbuntuOne.Common.pdb"
66 KeyPath="yes"/>
67 </Component>
68 <Component Id="DaemonProgramComponent"
69 Guid="f2d91a70-94b5-11df-981c-0800200c9a66">
70 <File Id="Canonical.UbuntuOne.ProcessDispatcher.exe"
71 Name="Canonical.UbuntuOne.ProcessDispatcher.exe"
72 DiskId="1"
73 Source="build_results\Daemon\Canonical.UbuntuOne.ProcessDispatcher.exe"
74 KeyPath="yes"/>
75 <!-- Install, start and stop service using the msi -->
76 <ServiceInstall Id="ProcessDispatcher.exe"
77 Name="UbuntuOne"
78 DisplayName="Ubuntu One Sync Daemon"
79 Type="ownProcess"
80 Interactive="no"
81 Start="auto"
82 Vital="yes"
83 ErrorControl="ignore"
84 Description="Provides a central process that manages the Ubuntu One sync daemon." />
85 <ServiceControl Id="ProcessDispatcherControl"
86 Name="UbuntuOne"
87 Start="install"
88 Stop="uninstall"
89 Remove="uninstall"
90 Wait="yes" />
91 </Component>
92 <Component Id="DaemonProgramComponentConfig"
93 Guid="6ac2f100-94bb-11df-981c-0800200c9a66">
94 <File Id="Canonical.UbuntuOne.ProcessDispatcher.exe.config"
95 Name="Canonical.UbuntuOne.ProcessDispatcher.exe.config"
96 DiskId="1"
97 Source="build_results\Daemon\Canonical.UbuntuOne.ProcessDispatcher.exe.config"
98 KeyPath="yes"/>
99 </Component>
100 <Component Id="DaemonProgramPdbComponent"
101 Guid="052b3280-94b6-11df-981c-0800200c9a66">
102 <File Id="Canonical.UbuntuOne.ProcessDispatcher.pdb"
103 Name="Canonical.UbuntuOne.ProcessDispatcher.pdb"
104 DiskId="1"
105 Source="build_results\Daemon\Canonical.UbuntuOne.ProcessDispatcher.pdb"
106 KeyPath="yes"/>
107 </Component>
108 <Component Id="CommonLoggingComponent"
109 Guid="24d7ded0-94b6-11df-981c-0800200c9a66">
110 <File Id="Common.Logging.dll"
111 Name="Common.Logging.dll"
112 DiskId="1"
113 Source="build_results\Daemon\Common.Logging.dll"
114 KeyPath="yes"/>
115 </Component>
116 <Component Id="Log4NetComponent"
117 Guid="0eafc310-94b7-11df-981c-0800200c9a66">
118 <File Id="log4net.dll"
119 Name="log4net.dll"
120 DiskId="1"
121 Source="build_results\Daemon\log4net.dll"
122 KeyPath="yes"/>
123 </Component>
124 <Component Id="ProtobufNetComponent"
125 Guid="24d3a3a0-94b7-11df-981c-0800200c9a66">
126 <File Id="protobufnet.dll"
127 Name="protobuf-net.dll"
128 DiskId="1"
129 Source="build_results\Daemon\protobuf-net.dll"
130 KeyPath="yes"/>
131 </Component>
132 <Component Id="ProtobufPdbComponent"
133 Guid="309dd3e0-94b7-11df-981c-0800200c9a66">
134 <File Id="protobufnet.pdb"
135 Name="protobuf-net.pdb"
136 DiskId="1"
137 Source="build_results\Daemon\protobuf-net.pdb"
138 KeyPath="yes"/>
139 </Component>
140 <Component Id="ProtobufConfigComponent"
141 Guid="44ba72c0-94b7-11df-981c-0800200c9a66">
142 <File Id="protobufnet.xml"
143 Name="protobuf-net.xml"
144 DiskId="1"
145 Source="build_results\Daemon\protobuf-net.xml"
146 KeyPath="yes"/>
147 </Component>
148 <Component Id="SpringAopComponent"
149 Guid="5431cc80-94b7-11df-981c-0800200c9a66">
150 <File Id="Spring.Aop.dll"
151 Name="Spring.Aop.dll"
152 DiskId="1"
153 Source="build_results\Daemon\Spring.Aop.dll"
154 KeyPath="yes"/>
155 </Component>
156 <Component Id="SpringAopConfigComponent"
157 Guid="668e92f0-94b7-11df-981c-0800200c9a66">
158 <File Id="Spring.Aop.xml"
159 Name="Spring.Aop.xml"
160 DiskId="1"
161 Source="build_results\Daemon\Spring.Aop.xml"
162 KeyPath="yes"/>
163 </Component>
164 <Component Id="SpringCoreComponent"
165 Guid="7780a5d0-94b7-11df-981c-0800200c9a66">
166 <File Id="Spring.Core.dll"
167 Name="Spring.Core.dll"
168 DiskId="1"
169 Source="build_results\Daemon\Spring.Core.dll"
170 KeyPath="yes"/>
171 </Component>
172 <Component Id="SpringCoreConfigComponent"
173 Guid="8149fd00-94b7-11df-981c-0800200c9a66">
174 <File Id="Spring.Core.xml"
175 Name="Spring.Core.xml"
176 DiskId="1"
177 Source="build_results\Daemon\Spring.Core.xml"
178 KeyPath="yes"/>
179 </Component>
180 </Directory>
48 </Directory>181 </Directory>
49 </Directory>182 </Directory>
50 <Directory Id="TOMBOY_INSTALLDIR"
51 Name="Tomboy">
52
53 </Directory>
54 </Directory>183 </Directory>
55 </Directory>184 </Directory>
56 185
@@ -59,13 +188,25 @@
59 Level="1"188 Level="1"
60 Title="Ubuntu One"189 Title="Ubuntu One"
61 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">190 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">
191 <ComponentRef Id="DaemonCommonLibComponent" />
192 <ComponentRef Id="DaemonCommonPdbComponent" />
193 <ComponentRef Id="CommonLoggingComponent" />
194 <ComponentRef Id="Log4NetComponent" />
195 <ComponentRef Id="ProtobufNetComponent" />
196 <ComponentRef Id="ProtobufPdbComponent" />
197 <ComponentRef Id="ProtobufConfigComponent" />
198 <ComponentRef Id="SpringAopComponent" />
199 <ComponentRef Id="SpringAopConfigComponent" />
200 <ComponentRef Id="SpringCoreComponent" />
201 <ComponentRef Id="SpringCoreConfigComponent" />
202 <ComponentRef Id="DaemonProgramComponent" />
203 <ComponentRef Id="DaemonProgramComponentConfig" />
204 <ComponentRef Id="DaemonProgramPdbComponent" />
62 </Feature>205 </Feature>
63 206
64 <!-- Provide the UI extensions to be used -->207 <!-- Provide the UI extensions to be used -->
65 <UIRef Id="WixUI_Mondo" />208 <UIRef Id="WixUI_Mondo" />
66 <UIRef Id="WixUI_ErrorProgressText" />209 <UIRef Id="WixUI_ErrorProgressText" />
67 <!-- Properties used -->
68
69 210
70 <!-- UI settings, to be defined by the design team -->211 <!-- UI settings, to be defined by the design team -->
71 <!-- <WixVariable Id="WixUILicenseRtf" Value="path\License.rtf" />212 <!-- <WixVariable Id="WixUILicenseRtf" Value="path\License.rtf" />
72213
=== modified file 'main.build'
--- main.build 2010-07-19 11:10:37 +0000
+++ main.build 2010-07-22 17:01:47 +0000
@@ -2,6 +2,7 @@
22
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 -->
4 <property name="enviroment" value="debug" />4 <property name="enviroment" value="debug" />
5 <property name="build_results" value="install/build_results" />
5 6
6 <target name="clean" 7 <target name="clean"
7 description="Removes all the different results of the last comilation if they exist">8 description="Removes all the different results of the last comilation if they exist">
@@ -39,11 +40,9 @@
39 <delete dir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin" if="${directory::exists('src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin')}" />40 <delete dir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin" if="${directory::exists('src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin')}" />
40 <delete dir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj" if="${directory::exists('src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj')}" />41 <delete dir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj" if="${directory::exists('src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj')}" />
41 42
42 <echo>Clean the data from tomboy</echo>43 <echo>Clean the data from the msi</echo>
43 44
44 <delete file="tomboy.msi" if="${file::exists('tomboy.msi')}" />45 <delete dir="${build_results}" if="${directory::exists('${build_results}')}" />
45 <delete file="tomboy.wxs" if="${file::exists('tomboy.wxs')}" />
46 <delete dir="install/tomboy" if="${directory::exists('install/tomboy')}" />
47 46
48 </target>47 </target>
49 48
@@ -142,19 +141,32 @@
142 description="Compiles the solution and create a merge installer that allows to install the solution and other related apps."141 description="Compiles the solution and create a merge installer that allows to install the solution and other related apps."
143 depends="build">142 depends="build">
144 143
144 <mkdir dir="${build_results}" />
145
146 <!-- The results from the build will have to be copied to a build result folder in install so that we do can build the msi -->
147 <copy todir="${build_results}/Daemon" flatten="true">
148 <fileset basedir="src/Canonical.UbuntuOne.ProcessDispatcher/bin/${enviroment}">
149 <include name="*.dll" />
150 <include name="*.pdb" />
151 <include name="*.xml" />
152 <include name="*.config" />
153 <include name="*.exe" />
154 </fileset>
155 </copy>
156
145 <!-- wix compiler -->157 <!-- wix compiler -->
146 <exec basedir="tools/Wix/bin"158 <exec basedir="tools/Wix/bin"
147 managed="true"159 managed="true"
148 workingdir="install"160 workingdir="install"
149 program="candle.exe"161 program="candle.exe"
150 commandline=" UbuntuOne.wxs"/>162 commandline="-ext WixUIExtension -ext WixUtilExtension UbuntuOne.wxs"/>
151 163
152 <!-- wix linker -->164 <!-- wix linker -->
153 <exec basedir="tools/Wix/bin"165 <exec basedir="tools/Wix/bin"
154 managed="true"166 managed="true"
155 workingdir="install"167 workingdir="install"
156 program="light.exe"168 program="light.exe"
157 commandline="-out UbuntuOne.msi -ext WixUIExtension UbuntuOne.wixobj"/>169 commandline="-out UbuntuOne.msi -ext WixUIExtension -ext WixUtilExtension UbuntuOne.wixobj"/>
158 170
159 171
160 </target>172 </target>

Subscribers

People subscribed via source and target branches

to all changes: