| 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-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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 | 80 |
| 81 if '*' in url.hostname: | 81 if '*' in url.hostname: |
| 82 allowAllDomains = True | 82 allowAllDomains = True |
| 83 continue | 83 continue |
| 84 | 84 |
| 85 allowedDomains.add(url.hostname) | 85 allowedDomains.add(url.hostname) |
| 86 | 86 |
| 87 return template.render( | 87 return template.render( |
| 88 basename=metadata.get('general', 'basename'), | 88 basename=metadata.get('general', 'basename'), |
| 89 version=params['version'], | 89 version=params['version'], |
| 90 shortVersion=metadata.get('general', 'version'), | |
| 91 releaseBuild=params['releaseBuild'], | 90 releaseBuild=params['releaseBuild'], |
| 92 name=catalog['name']['message'], | 91 name=catalog['name']['message'], |
| 93 description=catalog['description_safari']['message'], | 92 description=catalog['description_safari']['message'], |
| 94 author=get_optional('general', 'author'), | 93 author=get_optional('general', 'author'), |
| 95 homepage=get_optional('general', 'homepage'), | 94 homepage=get_optional('general', 'homepage'), |
| 96 updateURL=get_optional('general', 'updateURL'), | 95 updateURL=get_optional('general', 'updateURL'), |
| 97 allowedDomains=allowedDomains, | 96 allowedDomains=allowedDomains, |
| 98 allowAllDomains=allowAllDomains, | 97 allowAllDomains=allowAllDomains, |
| 99 allowSecurePages=allowSecurePages, | 98 allowSecurePages=allowSecurePages, |
| 100 startScripts=(get_optional('contentScripts', 'document_start') or '').split(
), | 99 startScripts=(get_optional('contentScripts', 'document_start') or '').split(
), |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 fixAbsoluteUrls(files) | 259 fixAbsoluteUrls(files) |
| 261 | 260 |
| 262 dirname = metadata.get('general', 'basename') + '.safariextension' | 261 dirname = metadata.get('general', 'basename') + '.safariextension' |
| 263 for filename in files.keys(): | 262 for filename in files.keys(): |
| 264 files[os.path.join(dirname, filename)] = files.pop(filename) | 263 files[os.path.join(dirname, filename)] = files.pop(filename) |
| 265 | 264 |
| 266 if keyFile: | 265 if keyFile: |
| 267 createSignedXarArchive(outFile, files, keyFile) | 266 createSignedXarArchive(outFile, files, keyFile) |
| 268 else: | 267 else: |
| 269 files.zip(outFile) | 268 files.zip(outFile) |
| OLD | NEW |