| 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  159     'baseDir': baseDir, |  159     'baseDir': baseDir, | 
|  160     'releaseBuild': releaseBuild, |  160     'releaseBuild': releaseBuild, | 
|  161     'version': version, |  161     'version': version, | 
|  162     'experimentalAPI': experimentalAPI, |  162     'experimentalAPI': experimentalAPI, | 
|  163     'devenv': devenv, |  163     'devenv': devenv, | 
|  164     'metadata': metadata, |  164     'metadata': metadata, | 
|  165   } |  165   } | 
|  166  |  166  | 
|  167   files = Files(getPackageFiles(params), getIgnoredFiles(params)) |  167   files = Files(getPackageFiles(params), getIgnoredFiles(params)) | 
|  168   files['manifest.json'] = createManifest(params) |  168   files['manifest.json'] = createManifest(params) | 
 |  169   if metadata.has_section('mapping'): | 
 |  170     files.readMappedFiles(baseDir, metadata.items('mapping')) | 
|  169   files.read(baseDir) |  171   files.read(baseDir) | 
|  170  |  172  | 
|  171   if metadata.has_section('convert_js'): |  173   if metadata.has_section('convert_js'): | 
|  172     convertJS(params, files) |  174     convertJS(params, files) | 
|  173  |  175  | 
|  174   if devenv: |  176   if devenv: | 
|  175     files['devenvPoller__.js'] = createPoller(params) |  177     files['devenvPoller__.js'] = createPoller(params) | 
|  176  |  178  | 
|  177   zipdata = files.zipToString() |  179   zipdata = files.zipToString() | 
|  178   signature = None |  180   signature = None | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
|  207   def shutdown_server(server): |  209   def shutdown_server(server): | 
|  208     time.sleep(10) |  210     time.sleep(10) | 
|  209     server.shutdown() |  211     server.shutdown() | 
|  210   thread.start_new_thread(shutdown_server, (server,)) |  212   thread.start_new_thread(shutdown_server, (server,)) | 
|  211   server.serve_forever() |  213   server.serve_forever() | 
|  212  |  214  | 
|  213   if connections[0] == 0: |  215   if connections[0] == 0: | 
|  214     print 'Warning: No incoming connections, extension probably not active in th
     e browser yet' |  216     print 'Warning: No incoming connections, extension probably not active in th
     e browser yet' | 
|  215   else: |  217   else: | 
|  216     print 'Handled %i connection(s)' % connections[0] |  218     print 'Handled %i connection(s)' % connections[0] | 
| OLD | NEW |