Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: remoting/candle_and_light.py

Issue 10673011: sas.dll is not included to Windows 8 SDK. Use one from from Windows 7 SDK instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """Run 'candle' and 'light' to transform .wxs to .msi.""" 6 """Run 'candle' and 'light' to transform .wxs to .msi."""
7 7
8 from optparse import OptionParser 8 from optparse import OptionParser
9 import os 9 import os
10 import subprocess 10 import subprocess
11 import sys 11 import sys
12 12
13 def run(command, filter=None): 13 def run(command, filter=None):
14 popen = subprocess.Popen( 14 popen = subprocess.Popen(
15 command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 15 command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
16 out, _ = popen.communicate() 16 out, _ = popen.communicate()
17 for line in out.splitlines(): 17 for line in out.splitlines():
18 if filter and line.strip() != filter: 18 if filter and line.strip() != filter:
19 print line 19 print line
20 return popen.returncode 20 return popen.returncode
21 21
22 def main(): 22 def main():
23 parser = OptionParser() 23 parser = OptionParser()
24 parser.add_option('--wix_path', dest='wix_path') 24 parser.add_option('--wix_path', dest='wix_path')
25 parser.add_option('--version', dest='version') 25 parser.add_option('--version', dest='version')
26 parser.add_option('--product_dir', dest='product_dir') 26 parser.add_option('--product_dir', dest='product_dir')
27 parser.add_option('--intermediate_dir', dest='intermediate_dir') 27 parser.add_option('--intermediate_dir', dest='intermediate_dir')
28 parser.add_option('--platformsdk_path', dest='platformsdk_path') 28 parser.add_option('--sas_dll_path', dest='sas_dll_path')
29 parser.add_option('-d', dest='define_list', action='append') 29 parser.add_option('-d', dest='define_list', action='append')
30 parser.add_option('--input', dest='input') 30 parser.add_option('--input', dest='input')
31 parser.add_option('--output', dest='output') 31 parser.add_option('--output', dest='output')
32 options, args = parser.parse_args() 32 options, args = parser.parse_args()
33 if args: 33 if args:
34 parser.error("no positional arguments expected") 34 parser.error("no positional arguments expected")
35 parameters = dict(options.__dict__) 35 parameters = dict(options.__dict__)
36 36
37 parameters['basename'] = os.path.splitext(os.path.basename(options.input))[0] 37 parameters['basename'] = os.path.splitext(os.path.basename(options.input))[0]
38 parameters['defines'] = '-d' + ' -d'.join(parameters['define_list']) 38 parameters['defines'] = '-d' + ' -d'.join(parameters['define_list'])
39 39
40 common = ( 40 common = (
41 '-nologo ' 41 '-nologo '
42 '-ext %(wix_path)s\\WixFirewallExtension.dll ' 42 '-ext %(wix_path)s\\WixFirewallExtension.dll '
43 '-ext %(wix_path)s\\WixUIExtension.dll ' 43 '-ext %(wix_path)s\\WixUIExtension.dll '
44 '-ext %(wix_path)s\\WixUtilExtension.dll ' 44 '-ext %(wix_path)s\\WixUtilExtension.dll '
45 '-dVersion=%(version)s ' 45 '-dVersion=%(version)s '
46 '-dFileSource=%(product_dir)s ' 46 '-dFileSource=%(product_dir)s '
47 '-dIconPath=resources/chromoting.ico ' 47 '-dIconPath=resources/chromoting.ico '
48 '-dSasDllPath=%(platformsdk_path)s/redist/x86/sas.dll ' 48 '-dSasDllPath=%(sas_dll_path)s/sas.dll '
49 '%(defines)s ' 49 '%(defines)s '
50 ) 50 )
51 51
52 candle_template = ('%(wix_path)s\\candle ' + 52 candle_template = ('%(wix_path)s\\candle ' +
53 common + 53 common +
54 '-out %(intermediate_dir)s/%(basename)s.wixobj ' + 54 '-out %(intermediate_dir)s/%(basename)s.wixobj ' +
55 '%(input)s ') 55 '%(input)s ')
56 rc = run(candle_template % parameters, os.path.basename(parameters['input'])) 56 rc = run(candle_template % parameters, os.path.basename(parameters['input']))
57 if rc: 57 if rc:
58 return rc 58 return rc
59 59
60 light_template = ('%(wix_path)s\\light ' + 60 light_template = ('%(wix_path)s\\light ' +
61 common + 61 common +
62 '-cultures:en-us ' + 62 '-cultures:en-us ' +
63 '-sw1076 ' + 63 '-sw1076 ' +
64 '-out %(output)s ' + 64 '-out %(output)s ' +
65 '%(intermediate_dir)s/%(basename)s.wixobj ') 65 '%(intermediate_dir)s/%(basename)s.wixobj ')
66 rc = run(light_template % parameters) 66 rc = run(light_template % parameters)
67 if rc: 67 if rc:
68 return rc 68 return rc
69 69
70 return 0 70 return 0
71 71
72 if __name__ == "__main__": 72 if __name__ == "__main__":
73 sys.exit(main()) 73 sys.exit(main())
OLDNEW
« build/common.gypi ('K') | « build/common.gypi ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698