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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 FALLBACK_PATHS['x86'] = ['chromium-linux-x86'] + FALLBACK_PATHS['x86_64'] | 47 FALLBACK_PATHS['x86'] = ['chromium-linux-x86'] + FALLBACK_PATHS['x86_64'] |
48 | 48 |
49 DEFAULT_BUILD_DIRECTORIES = ('sconsbuild', 'out') | 49 DEFAULT_BUILD_DIRECTORIES = ('sconsbuild', 'out') |
50 | 50 |
51 @classmethod | 51 @classmethod |
52 def _determine_driver_path_statically(cls, host, options): | 52 def _determine_driver_path_statically(cls, host, options): |
53 config_object = config.Config(host.executive, host.filesystem) | 53 config_object = config.Config(host.executive, host.filesystem) |
54 build_directory = getattr(options, 'build_directory', None) | 54 build_directory = getattr(options, 'build_directory', None) |
55 webkit_base = WebKitFinder(host.filesystem).webkit_base() | 55 webkit_base = WebKitFinder(host.filesystem).webkit_base() |
56 chromium_base = cls._chromium_base_dir(host.filesystem) | 56 chromium_base = cls._chromium_base_dir(host.filesystem) |
| 57 driver_name = getattr(options, 'driver_name', None) |
| 58 if driver_name is None: |
| 59 driver_name = cls.CONTENT_SHELL_NAME |
57 if hasattr(options, 'configuration') and options.configuration: | 60 if hasattr(options, 'configuration') and options.configuration: |
58 configuration = options.configuration | 61 configuration = options.configuration |
59 else: | 62 else: |
60 configuration = config_object.default_configuration() | 63 configuration = config_object.default_configuration() |
61 return cls._static_build_path(host.filesystem, build_directory, chromium
_base, webkit_base, configuration, [cls.CONTENT_SHELL_NAME]) | 64 return cls._static_build_path(host.filesystem, build_directory, chromium
_base, webkit_base, configuration, [driver_name]) |
62 | 65 |
63 @staticmethod | 66 @staticmethod |
64 def _determine_architecture(filesystem, executive, driver_path): | 67 def _determine_architecture(filesystem, executive, driver_path): |
65 file_output = '' | 68 file_output = '' |
66 if filesystem.exists(driver_path): | 69 if filesystem.exists(driver_path): |
67 # The --dereference flag tells file to follow symlinks | 70 # The --dereference flag tells file to follow symlinks |
68 file_output = executive.run_command(['file', '--brief', '--dereferen
ce', driver_path], return_stderr=True) | 71 file_output = executive.run_command(['file', '--brief', '--dereferen
ce', driver_path], return_stderr=True) |
69 | 72 |
70 if re.match(r'ELF 32-bit LSB\s+executable', file_output): | 73 if re.match(r'ELF 32-bit LSB\s+executable', file_output): |
71 return 'x86' | 74 return 'x86' |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 | 158 |
156 def _path_to_lighttpd_php(self): | 159 def _path_to_lighttpd_php(self): |
157 return "/usr/bin/php-cgi" | 160 return "/usr/bin/php-cgi" |
158 | 161 |
159 def _path_to_driver(self, configuration=None): | 162 def _path_to_driver(self, configuration=None): |
160 binary_name = self.driver_name() | 163 binary_name = self.driver_name() |
161 return self._build_path_with_configuration(configuration, binary_name) | 164 return self._build_path_with_configuration(configuration, binary_name) |
162 | 165 |
163 def _path_to_helper(self): | 166 def _path_to_helper(self): |
164 return None | 167 return None |
OLD | NEW |