OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2015 The Chromium Authors. All rights reserved. | 2 # Copyright 2015 The Chromium Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 import argparse | 6 import argparse |
7 from datetime import datetime | 7 from datetime import datetime |
8 import logging | 8 import logging |
9 import os | 9 import os |
10 import shutil | 10 import shutil |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 dart_filter) | 172 dart_filter) |
173 | 173 |
174 # Mojo package, lots of overlap with gen, must be copied: | 174 # Mojo package, lots of overlap with gen, must be copied: |
175 copy(src_path('mojo/public'), sdk_path('packages/mojo/lib/public'), | 175 copy(src_path('mojo/public'), sdk_path('packages/mojo/lib/public'), |
176 dart_filter) | 176 dart_filter) |
177 mojom_dirs = [ os.path.join(build_dir, 'gen/dart-gen/mojom') ] | 177 mojom_dirs = [ os.path.join(build_dir, 'gen/dart-gen/mojom') ] |
178 mojom_dirs += args.extra_mojom_dirs | 178 mojom_dirs += args.extra_mojom_dirs |
179 for mojom_dir in mojom_dirs: | 179 for mojom_dir in mojom_dirs: |
180 copy(mojom_dir, sdk_path('packages/mojom/lib/'), gen_filter) | 180 copy(mojom_dir, sdk_path('packages/mojom/lib/'), gen_filter) |
181 | 181 |
| 182 # By convention the generated .mojom.dart files in a pub package |
| 183 # go under $PACKAGE/lib/mojom. |
| 184 # TODO: Should *all* generated bindings under dart-gen/mojom go into the |
| 185 # the mojo package? Maybe everything aside from mojom/sky stuff? |
| 186 copy(os.path.join(build_dir, 'gen/dart-gen/mojom/mojo'), |
| 187 sdk_path('packages/mojo/lib/mojom'), gen_filter) |
| 188 copy(os.path.join(build_dir, 'gen/dart-gen/mojom/sky'), |
| 189 sdk_path('packages/sky/lib/mojom'), gen_filter) |
| 190 |
182 # Mojo SDK additions: | 191 # Mojo SDK additions: |
183 copy_or_link(src_path('mojo/public/dart/bindings.dart'), | 192 copy_or_link(src_path('mojo/public/dart/bindings.dart'), |
184 sdk_path('packages/mojo/sdk_additions/dart_mojo_bindings.dart')) | 193 sdk_path('packages/mojo/sdk_additions/dart_mojo_bindings.dart')) |
185 copy_or_link(src_path('mojo/public/dart/core.dart'), | 194 copy_or_link(src_path('mojo/public/dart/core.dart'), |
186 sdk_path('packages/mojo/sdk_additions/dart_mojo_core.dart')) | 195 sdk_path('packages/mojo/sdk_additions/dart_mojo_core.dart')) |
187 | 196 |
188 if not skip_apks: | 197 if not skip_apks: |
189 ensure_dir_exists(sdk_path('packages/sky/apks')) | 198 ensure_dir_exists(sdk_path('packages/sky/apks')) |
190 shutil.copy(os.path.join(build_dir, 'apks', 'SkyDemo.apk'), | 199 shutil.copy(os.path.join(build_dir, 'apks', 'SkyDemo.apk'), |
191 sdk_path('packages/sky/apks')) | 200 sdk_path('packages/sky/apks')) |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 'git', 'commit', | 234 'git', 'commit', |
226 '-m', commit_message | 235 '-m', commit_message |
227 ], cwd=sdk_root) | 236 ], cwd=sdk_root) |
228 | 237 |
229 time_delta = datetime.now() - start_time | 238 time_delta = datetime.now() - start_time |
230 print 'SDK built at %s in %ss' % (sdk_root, time_delta.total_seconds()) | 239 print 'SDK built at %s in %ss' % (sdk_root, time_delta.total_seconds()) |
231 | 240 |
232 | 241 |
233 if __name__ == '__main__': | 242 if __name__ == '__main__': |
234 main() | 243 main() |
OLD | NEW |