remoting/host/installer/chromoting.wxs - Issue 10081026: Chromoting Host installation should take into account both buildtype% and branding%.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: remoting/host/installer/chromoting.wxs

Issue 10081026: Chromoting Host installation should take into account both buildtype% and branding%. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 <?xml version="1.0"?>	1 <?xml version="1.0"?>

2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">	2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

3	3

4 <?define EventSourceName = "chromoting" ?>	4 <?define EventSourceName = "chromoting" ?>

5 <?define ServiceName = "chromoting" ?>	5 <?define ServiceName = "chromoting" ?>

6	6

7 <?ifdef OfficialBuild ?>	7 <?if $(var.Branding) ~= Chrome ?>

8 <?define ChromotingHost = "Chrome Remote Desktop Host" ?>	8 <?define ChromotingHost = "Chrome Remote Desktop Host" ?>

9 <?define FirewallName = "Chrome Remote Desktop Host" ?>	9 <?define FirewallName = "Chrome Remote Desktop Host" ?>

10 <?define Manufacturer = "Google Inc." ?>	10 <?define Manufacturer = "Google Inc." ?>

11 <?else?>	11 <?else?>

12 <?define ChromotingHost = "Chromoting Host" ?>	12 <?define ChromotingHost = "Chromoting Host" ?>

13 <?define FirewallName = "Chromoting Host" ?>	13 <?define FirewallName = "Chromoting Host" ?>

14 <?define Manufacturer = "The Chromium Authors" ?>	14 <?define Manufacturer = "The Chromium Authors" ?>

15 <?endif?>	15 <?endif?>

16	16

17 <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?>	17 <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?>

(...skipping 309 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
327	327

328 <InstallExecuteSequence>	328 <InstallExecuteSequence>

329 <Custom Action="query_auto_start_service" Before="InstallInitialize"/>	329 <Custom Action="query_auto_start_service" Before="InstallInitialize"/>

330 <Custom Action="set_auto_start_service" After="StartServices">	330 <Custom Action="set_auto_start_service" After="StartServices">

331 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]>	331 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]>

332 </Custom>	332 </Custom>

333 </InstallExecuteSequence>	333 </InstallExecuteSequence>

334	334

335 </Product>	335 </Product>

336 </Wix>	336 </Wix>

OLD	NEW

« no previous file with comments | « no previous file | remoting/remoting.gyp » ('j') | no next file with comments »