remoting/tools/candle_and_light.py - Issue 10828203: Reverting r148671, r149866 (broke VS2008 builder) and r150361 (broke ninja).

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

Unified Diff: remoting/tools/candle_and_light.py

Issue 10828203: Reverting r148671, r149866 (broke VS2008 builder) and r150361 (broke ninja). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Let's try GYP r1446. Created 8 years, 4 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 side-by-side diff with in-line comments

Download patch

Index: remoting/tools/candle_and_light.py

diff --git a/remoting/tools/candle_and_light.py b/remoting/tools/candle_and_light.py

index 74a2572da187e983ce37d3b464e76f452194ed66..056bffd441db94a010ab4b142a2bb9e5c4ca8a1d 100755

--- a/remoting/tools/candle_and_light.py

+++ b/remoting/tools/candle_and_light.py

@@ -23,7 +23,6 @@ def main():

parser = OptionParser()

parser.add_option('--wix_path', dest='wix_path')

parser.add_option('--version', dest='version')

- parser.add_option('--controller_clsid', dest='controller_clsid')

parser.add_option('--product_dir', dest='product_dir')

parser.add_option('--intermediate_dir', dest='intermediate_dir')

parser.add_option('--sas_dll_path', dest='sas_dll_path')

@@ -43,7 +42,6 @@ def main():

'-ext "%(wix_path)s\\WixFirewallExtension.dll" '

'-ext "%(wix_path)s\\WixUIExtension.dll" '

'-ext "%(wix_path)s\\WixUtilExtension.dll" '

- '"-dControllerClsid="%(controller_clsid)s"" '

'-dVersion=%(version)s '

'"-dFileSource=%(product_dir)s" '

'-dIconPath=resources/chromoting.ico '

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