Delta Between Two Patch Sets: build.py
Issue 11544056:
Prepared buildtools for Safari (Closed)
Left Patch Set: Made "Chrome" be not replaced with "Safari" in the warning on the first run page
Created Oct. 25, 2013, 4:55 p.m.
Right Patch Set:
Created Oct. 31, 2013, 3:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« background.html.tmpl ('k')
|
imageConversion.py » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 # coding: utf-8 | 1 # coding: utf-8 |
| 2 | 2 |
| 3 # This file is part of the Adblock Plus build tools, | 3 # This file is part of the Adblock Plus build tools, |
| 4 # Copyright (C) 2006-2013 Eyeo GmbH | 4 # Copyright (C) 2006-2013 Eyeo GmbH |
| 5 # | 5 # |
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | 6 # Adblock Plus is free software: you can redistribute it and/or modify |
| 7 # it under the terms of the GNU General Public License version 3 as | 7 # it under the terms of the GNU General Public License version 3 as |
| 8 # published by the Free Software Foundation. | 8 # published by the Free Software Foundation. |
| 9 # | 9 # |
| 10 # Adblock Plus is distributed in the hope that it will be useful, | 10 # Adblock Plus is distributed in the hope that it will be useful, |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 packager.createBuild(baseDir, type=type, outFile=outFile, locales=locales, b uildNum=buildNum, | 195 packager.createBuild(baseDir, type=type, outFile=outFile, locales=locales, b uildNum=buildNum, |
| 196 releaseBuild=releaseBuild, keyFile=keyFile, | 196 releaseBuild=releaseBuild, keyFile=keyFile, |
| 197 multicompartment=multicompartment) | 197 multicompartment=multicompartment) |
| 198 elif type == 'chrome' or type == 'opera': | 198 elif type == 'chrome' or type == 'opera': |
| 199 import buildtools.packagerChrome as packager | 199 import buildtools.packagerChrome as packager |
| 200 packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum, | 200 packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum, |
| 201 releaseBuild=releaseBuild, keyFile=keyFile, | 201 releaseBuild=releaseBuild, keyFile=keyFile, |
| 202 experimentalAPI=experimentalAPI) | 202 experimentalAPI=experimentalAPI) |
| 203 elif type == 'safari': | 203 elif type == 'safari': |
| 204 import buildtools.packagerSafari as packager | 204 import buildtools.packagerSafari as packager |
| 205 packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum, releaseBuild=releaseBuild, keyFile=keyFile) | 205 packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum, |
|
Wladimir Palant
2013/10/30 13:36:01
Nit: restricting line length to 80 characters here
| |
| 206 releaseBuild=releaseBuild, keyFile=keyFile) | |
| 206 | 207 |
| 207 | 208 |
| 208 def runAutoInstall(baseDir, scriptName, opts, args, type): | 209 def runAutoInstall(baseDir, scriptName, opts, args, type): |
| 209 if len(args) == 0: | 210 if len(args) == 0: |
| 210 print 'Port of the Extension Auto-Installer needs to be specified' | 211 print 'Port of the Extension Auto-Installer needs to be specified' |
| 211 usage(scriptName, type, 'autoinstall') | 212 usage(scriptName, type, 'autoinstall') |
| 212 return | 213 return |
| 213 | 214 |
| 214 multicompartment = False | 215 multicompartment = False |
| 215 for option, value in opts: | 216 for option, value in opts: |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 565 if option in ('-h', '--help'): | 566 if option in ('-h', '--help'): |
| 566 usage(scriptName, type, command) | 567 usage(scriptName, type, command) |
| 567 sys.exit() | 568 sys.exit() |
| 568 commands[command](baseDir, scriptName, opts, args, type) | 569 commands[command](baseDir, scriptName, opts, args, type) |
| 569 else: | 570 else: |
| 570 print 'Command %s is not supported for this application type' % command | 571 print 'Command %s is not supported for this application type' % command |
| 571 usage(scriptName, type) | 572 usage(scriptName, type) |
| 572 else: | 573 else: |
| 573 print 'Command %s is unrecognized' % command | 574 print 'Command %s is unrecognized' % command |
| 574 usage(scriptName, type) | 575 usage(scriptName, type) |
| LEFT | RIGHT |
« background.html.tmpl ('k')
|
imageConversion.py » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
