Skip to content

Commit

Permalink
keep old location of libraries.dart in the generated SDK (fixes 23755)
Browse files Browse the repository at this point in the history
R=kevmoo@google.com

Review URL: https://codereview.chromium.org//1216313002.
  • Loading branch information
sigmundch committed Jul 1, 2015
1 parent cf790b0 commit 4ec3db6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion pkg/analyzer/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: Dart Team <misc@dartlang.org>
description: Static analyzer for Dart.
homepage: http://www.dartlang.org
environment:
sdk: '>=1.8.0 <2.0.0'
sdk: '>=1.12.0-dev.1.0 <2.0.0'
dependencies:
args: '>=0.12.1 <0.14.0'
html: ^0.12.0
Expand Down
9 changes: 0 additions & 9 deletions sdk/lib/_internal/libraries.dart

This file was deleted.

11 changes: 11 additions & 0 deletions tools/create_sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,17 @@ def Main():
ignore=ignore_patterns('*.svn', 'doc', '*.py', '*.gypi', '*.sh',
'.gitignore'))

# Copy libraries.dart to lib/_internal/libraries.dart for backwards
# compatibility.
#
# TODO(sigmund): stop copying libraries.dart. Old versions (<=0.25.1-alpha.4)
# of the analyzer package do not support the new location of this file. We
# should be able to remove the old file once we release a newer version of
# analyzer and popular frameworks have migrated to use it.
copyfile(join(HOME, 'sdk', 'lib', '_internal',
'sdk_library_metadata', 'lib', 'libraries.dart'),
join(LIB, '_internal', 'libraries.dart'))

# Create and copy tools.
UTIL = join(SDK_tmp, 'util')
os.makedirs(UTIL)
Expand Down
2 changes: 1 addition & 1 deletion utils/dartanalyzer/dartanalyzer.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'action_name': 'generate_dartanalyzer_snapshot',
'inputs': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'../../sdk/lib/_internal/libraries.dart',
'../../sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart',
'<(SHARED_INTERMEDIATE_DIR)/packages.stamp',
'<!@(["python", "../../tools/list_files.py", "\\.dart$", "../../third_party/pkg/analyzer_cli"])',
],
Expand Down

0 comments on commit 4ec3db6

Please sign in to comment.