| OLD | NEW |
| 1 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 1 # Copyright (C) 2013 Adobe Systems Incorporated. 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 | 4 # modification, are permitted provided that the following conditions |
| 5 # are met: | 5 # are met: |
| 6 # | 6 # |
| 7 # 1. Redistributions of source code must retain the above | 7 # 1. Redistributions of source code must retain the above |
| 8 # copyright notice, this list of conditions and the following | 8 # copyright notice, this list of conditions and the following |
| 9 # disclaimer. | 9 # disclaimer. |
| 10 # 2. Redistributions in binary form must reproduce the above | 10 # 2. Redistributions in binary form must reproduce the above |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 path_base = self.destination_directory.replace(self.layout_tests
_dir + '/', '') + '/' + path_base | 120 path_base = self.destination_directory.replace(self.layout_tests
_dir + '/', '') + '/' + path_base |
| 121 if path_base in paths_to_skip: | 121 if path_base in paths_to_skip: |
| 122 if self.import_in_place: | 122 if self.import_in_place: |
| 123 _log.debug('Pruning: %s', path_base) | 123 _log.debug('Pruning: %s', path_base) |
| 124 self.filesystem.remove(path_full) | 124 self.filesystem.remove(path_full) |
| 125 continue | 125 continue |
| 126 else: | 126 else: |
| 127 continue | 127 continue |
| 128 # FIXME: This block should really be a separate function, but th
e early-continues make that difficult. | 128 # FIXME: This block should really be a separate function, but th
e early-continues make that difficult. |
| 129 | 129 |
| 130 # TODO(qyearsley): Remove the below block. | |
| 131 if filename != '.gitignore' and (filename.startswith('.') or fil
ename.endswith('.pl')): | |
| 132 _log.debug('Skipping: %s', path_full) | |
| 133 _log.debug(' Reason: Hidden files and perl scripts are not
necessary.') | |
| 134 continue | |
| 135 | |
| 136 if filename == 'OWNERS' or filename == 'reftest.list': | 130 if filename == 'OWNERS' or filename == 'reftest.list': |
| 137 # See http://crbug.com/584660 and http://crbug.com/582838. | 131 # See http://crbug.com/584660 and http://crbug.com/582838. |
| 138 _log.debug('Skipping: %s', path_full) | 132 _log.debug('Skipping: %s', path_full) |
| 139 _log.debug(' Reason: This file may cause Chromium presubmit
to fail.') | 133 _log.debug(' Reason: This file may cause Chromium presubmit
to fail.') |
| 140 continue | 134 continue |
| 141 | 135 |
| 142 copy_list.append({'src': path_full, 'dest': filename}) | 136 copy_list.append({'src': path_full, 'dest': filename}) |
| 143 | 137 |
| 144 if copy_list: | 138 if copy_list: |
| 145 # Only add this directory to the list if there's something to im
port | 139 # Only add this directory to the list if there's something to im
port |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 # In other words, there's no sense in overwriting identical files, but | 219 # In other words, there's no sense in overwriting identical files, but |
| 226 # there's no harm in copying the identical thing. | 220 # there's no harm in copying the identical thing. |
| 227 _log.debug(' copying %s', relpath) | 221 _log.debug(' copying %s', relpath) |
| 228 | 222 |
| 229 if not self.import_in_place: | 223 if not self.import_in_place: |
| 230 self.filesystem.copyfile(source_path, dest_path) | 224 self.filesystem.copyfile(source_path, dest_path) |
| 231 if self.filesystem.read_binary_file(source_path)[:2] == '#!': | 225 if self.filesystem.read_binary_file(source_path)[:2] == '#!': |
| 232 self.filesystem.make_executable(dest_path) | 226 self.filesystem.make_executable(dest_path) |
| 233 | 227 |
| 234 return dest_path.replace(self._webkit_root, '') | 228 return dest_path.replace(self._webkit_root, '') |
| OLD | NEW |