| OLD | NEW |
| 1 # coding: utf-8 | 1 # coding: utf-8 |
| 2 | 2 |
| 3 # This file is part of the Adblock Plus web scripts, | 3 # This file is part of the Adblock Plus web scripts, |
| 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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 | 261 |
| 262 if self.config.type == 'android': | 262 if self.config.type == 'android': |
| 263 apkFile = open(outputPath, 'wb') | 263 apkFile = open(outputPath, 'wb') |
| 264 | 264 |
| 265 try: | 265 try: |
| 266 try: | 266 try: |
| 267 port = get_config().get('extensions', 'androidBuildPort') | 267 port = get_config().get('extensions', 'androidBuildPort') |
| 268 except ConfigParser.NoOptionError: | 268 except ConfigParser.NoOptionError: |
| 269 port = '22' | 269 port = '22' |
| 270 buildCommand = ['ssh', '-p', port, get_config().get('extensions', 'andro
idBuildHost')] | 270 buildCommand = ['ssh', '-p', port, get_config().get('extensions', 'andro
idBuildHost')] |
| 271 buildCommand += map(pipes.quote, ['/home/android/bin/makedebugbuild.py',
'--revision', self.revision, '--version', self.version, '--stdout']) | 271 buildCommand.extend(map(pipes.quote, ['/home/android/bin/makedebugbuild.
py', '--revision', self.revision, '--version', self.version, '--stdout'])) |
| 272 subprocess.check_call(buildCommand, stdout=apkFile, close_fds=True) | 272 subprocess.check_call(buildCommand, stdout=apkFile, close_fds=True) |
| 273 except: | 273 except: |
| 274 # clear broken output if any | 274 # clear broken output if any |
| 275 if os.path.exists(outputPath): | 275 if os.path.exists(outputPath): |
| 276 os.remove(outputPath) | 276 os.remove(outputPath) |
| 277 raise | 277 raise |
| 278 elif self.config.type == 'chrome' or self.config.type == 'opera': | 278 elif self.config.type == 'chrome' or self.config.type == 'opera': |
| 279 import buildtools.packagerChrome as packager | 279 import buildtools.packagerChrome as packager |
| 280 packager.createBuild(self.tempdir, type=self.config.type, outFile=outputPa
th, buildNum=self.revision, keyFile=self.config.keyFile, experimentalAPI=self.co
nfig.experimental) | 280 packager.createBuild(self.tempdir, type=self.config.type, outFile=outputPa
th, buildNum=self.revision, keyFile=self.config.keyFile, experimentalAPI=self.co
nfig.experimental) |
| 281 else: | 281 else: |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 except Exception, ex: | 432 except Exception, ex: |
| 433 print >>sys.stderr, "The build for %s failed:" % repo | 433 print >>sys.stderr, "The build for %s failed:" % repo |
| 434 traceback.print_exc() | 434 traceback.print_exc() |
| 435 | 435 |
| 436 file = open(nightlyConfigFile, 'wb') | 436 file = open(nightlyConfigFile, 'wb') |
| 437 nightlyConfig.write(file) | 437 nightlyConfig.write(file) |
| 438 | 438 |
| 439 | 439 |
| 440 if __name__ == '__main__': | 440 if __name__ == '__main__': |
| 441 main() | 441 main() |
| OLD | NEW |