| Left: | ||
| Right: |
| 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-2015 Eyeo GmbH | 4 # Copyright (C) 2006-2015 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 190 | 190 |
| 191 def readSafariMetadata(self): | 191 def readSafariMetadata(self): |
| 192 import buildtools.packagerSafari as packager | 192 import buildtools.packagerSafari as packager |
| 193 metadata = packager.readMetadata(self.tempdir, self.config.type) | 193 metadata = packager.readMetadata(self.tempdir, self.config.type) |
| 194 certs = packager.get_certificates_and_key(self.config.keyFile)[0] | 194 certs = packager.get_certificates_and_key(self.config.keyFile)[0] |
| 195 | 195 |
| 196 self.certificateID = packager.get_developer_identifier(certs) | 196 self.certificateID = packager.get_developer_identifier(certs) |
| 197 self.version = packager.getBuildVersion(self.tempdir, metadata, False, self. revision) | 197 self.version = packager.getBuildVersion(self.tempdir, metadata, False, self. revision) |
| 198 self.shortVersion = metadata.get("general", "version") | 198 self.shortVersion = metadata.get("general", "version") |
| 199 self.basename = metadata.get("general", "basename") | 199 self.basename = metadata.get("general", "basename") |
| 200 self.updatedFromGallery = True | |
|
Wladimir Palant
2015/07/16 19:13:26
What's the point having a flag if it is a constant
Sebastian Noack
2015/07/17 11:08:45
We use the same template to generate the update ma
Sebastian Noack
2015/07/17 11:34:52
Argh, I just realized that I got it the wrong way
| |
| 200 | 201 |
| 201 def writeUpdateManifest(self): | 202 def writeUpdateManifest(self): |
| 202 """ | 203 """ |
| 203 Writes update.rdf file for the current build | 204 Writes update.rdf file for the current build |
| 204 """ | 205 """ |
| 205 baseDir = os.path.join(self.config.nightliesDirectory, self.basename) | 206 baseDir = os.path.join(self.config.nightliesDirectory, self.basename) |
| 206 if not os.path.exists(baseDir): | 207 if not os.path.exists(baseDir): |
| 207 os.makedirs(baseDir) | 208 os.makedirs(baseDir) |
| 208 if self.config.type == 'chrome' or self.config.type == 'opera': | 209 if self.config.type == 'chrome' or self.config.type == 'opera': |
| 209 manifestPath = os.path.join(baseDir, "updates.xml") | 210 manifestPath = os.path.join(baseDir, "updates.xml") |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 509 except Exception, ex: | 510 except Exception, ex: |
| 510 print >>sys.stderr, "The build for %s failed:" % repo | 511 print >>sys.stderr, "The build for %s failed:" % repo |
| 511 traceback.print_exc() | 512 traceback.print_exc() |
| 512 | 513 |
| 513 file = open(nightlyConfigFile, 'wb') | 514 file = open(nightlyConfigFile, 'wb') |
| 514 nightlyConfig.write(file) | 515 nightlyConfig.write(file) |
| 515 | 516 |
| 516 | 517 |
| 517 if __name__ == '__main__': | 518 if __name__ == '__main__': |
| 518 main() | 519 main() |
| OLD | NEW |