| OLD | NEW |
| 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-2012 Eyeo GmbH | 4 # Copyright (C) 2006-2012 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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 'releaseBuild': releaseBuild, | 307 'releaseBuild': releaseBuild, |
| 308 'version': version.encode('utf-8'), | 308 'version': version.encode('utf-8'), |
| 309 'metadata': metadata, | 309 'metadata': metadata, |
| 310 'contributors': contributors, | 310 'contributors': contributors, |
| 311 'multicompartment': multicompartment, | 311 'multicompartment': multicompartment, |
| 312 } | 312 } |
| 313 | 313 |
| 314 files = Files(getPackageFiles(params), getIgnoredFiles(params), | 314 files = Files(getPackageFiles(params), getIgnoredFiles(params), |
| 315 process=lambda path, data: processFile(path, data, params)) | 315 process=lambda path, data: processFile(path, data, params)) |
| 316 files['install.rdf'] = createManifest(params) | 316 files['install.rdf'] = createManifest(params) |
| 317 if metadata.has_section('mapping'): |
| 318 files.readMappedFiles(baseDir, metadata.items('mapping')) |
| 317 files.read(baseDir, skip=('chrome')) | 319 files.read(baseDir, skip=('chrome')) |
| 318 for name, path in getChromeSubdirs(baseDir, params['locales']).iteritems(): | 320 for name, path in getChromeSubdirs(baseDir, params['locales']).iteritems(): |
| 319 if os.path.isdir(path): | 321 if os.path.isdir(path): |
| 320 files.read(path, 'chrome/%s' % name) | 322 files.read(path, 'chrome/%s' % name) |
| 321 fixupLocales(params, files) | 323 fixupLocales(params, files) |
| 322 if not 'bootstrap.js' in files: | 324 if not 'bootstrap.js' in files: |
| 323 addMissingFiles(params, files) | 325 addMissingFiles(params, files) |
| 324 if keyFile: | 326 if keyFile: |
| 325 signFiles(files, keyFile) | 327 signFiles(files, keyFile) |
| 326 files.zip(outFile, sortKey=lambda x: '!' if x == 'META-INF/zigbert.rsa' else x
) | 328 files.zip(outFile, sortKey=lambda x: '!' if x == 'META-INF/zigbert.rsa' else x
) |
| 327 | 329 |
| 328 def autoInstall(baseDir, host, port, multicompartment=False): | 330 def autoInstall(baseDir, host, port, multicompartment=False): |
| 329 fileBuffer = StringIO() | 331 fileBuffer = StringIO() |
| 330 createBuild(baseDir, outFile=fileBuffer, multicompartment=multicompartment) | 332 createBuild(baseDir, outFile=fileBuffer, multicompartment=multicompartment) |
| 331 urllib.urlopen('http://%s:%s/' % (host, port), data=fileBuffer.getvalue()) | 333 urllib.urlopen('http://%s:%s/' % (host, port), data=fileBuffer.getvalue()) |
| OLD | NEW |