OLD | NEW |
1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
2 # | 2 # |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 | 52 |
53 BUILD_REQUIREMENTS_URL = 'https://code.google.com/p/chromium/wiki/LinuxBuild
Instructions' | 53 BUILD_REQUIREMENTS_URL = 'https://code.google.com/p/chromium/wiki/LinuxBuild
Instructions' |
54 | 54 |
55 @classmethod | 55 @classmethod |
56 def _determine_driver_path_statically(cls, host, options): | 56 def _determine_driver_path_statically(cls, host, options): |
57 config_object = config.Config(host.executive, host.filesystem) | 57 config_object = config.Config(host.executive, host.filesystem) |
58 build_directory = getattr(options, 'build_directory', None) | 58 build_directory = getattr(options, 'build_directory', None) |
59 finder = WebKitFinder(host.filesystem) | 59 finder = WebKitFinder(host.filesystem) |
60 webkit_base = finder.webkit_base() | 60 webkit_base = finder.webkit_base() |
61 chromium_base = finder.chromium_base() | 61 chromium_base = finder.chromium_base() |
62 driver_name = getattr(options, 'driver_name', None) | 62 driver_name = cls.SKY_SHELL_NAME |
63 if driver_name is None: | |
64 driver_name = cls.CONTENT_SHELL_NAME | |
65 if hasattr(options, 'configuration') and options.configuration: | 63 if hasattr(options, 'configuration') and options.configuration: |
66 configuration = options.configuration | 64 configuration = options.configuration |
67 else: | 65 else: |
68 configuration = config_object.default_configuration() | 66 configuration = config_object.default_configuration() |
69 return cls._static_build_path(host.filesystem, build_directory, chromium
_base, configuration, [driver_name]) | 67 return cls._static_build_path(host.filesystem, build_directory, chromium
_base, configuration, [driver_name]) |
70 | 68 |
71 @staticmethod | 69 @staticmethod |
72 def _determine_architecture(filesystem, executive, driver_path): | 70 def _determine_architecture(filesystem, executive, driver_path): |
73 file_output = '' | 71 file_output = '' |
74 if filesystem.isfile(driver_path): | 72 if filesystem.isfile(driver_path): |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 return path | 154 return path |
157 _log.error("Could not find apache. Not installed or unknown path.") | 155 _log.error("Could not find apache. Not installed or unknown path.") |
158 return None | 156 return None |
159 | 157 |
160 def _path_to_driver(self, configuration=None): | 158 def _path_to_driver(self, configuration=None): |
161 binary_name = self.driver_name() | 159 binary_name = self.driver_name() |
162 return self._build_path_with_configuration(configuration, binary_name) | 160 return self._build_path_with_configuration(configuration, binary_name) |
163 | 161 |
164 def _path_to_helper(self): | 162 def _path_to_helper(self): |
165 return None | 163 return None |
OLD | NEW |