mirror of
https://github.com/dart-lang/sdk
synced 2024-11-05 18:22:09 +00:00
Move pkg/path to pkg/pathos.
Review URL: https://codereview.chromium.org//12316056 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@18906 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
parent
a979ddd7b5
commit
c8f6014ae7
46 changed files with 50 additions and 50 deletions
|
@ -2,12 +2,12 @@
|
|||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
library path_test;
|
||||
library pathos_posix_test;
|
||||
|
||||
import 'dart:io' as io;
|
||||
|
||||
import 'package:unittest/unittest.dart';
|
||||
import 'package:path/path.dart' as path;
|
||||
import 'package:pathos/path.dart' as path;
|
||||
|
||||
main() {
|
||||
var builder = new path.Builder(style: path.Style.posix, root: '/root/path');
|
|
@ -2,12 +2,12 @@
|
|||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
library all_test;
|
||||
library pathos_test;
|
||||
|
||||
import 'dart:io' as io;
|
||||
|
||||
import 'package:unittest/unittest.dart';
|
||||
import 'package:path/path.dart' as path;
|
||||
import 'package:pathos/path.dart' as path;
|
||||
|
||||
main() {
|
||||
group('path.Style', () {
|
|
@ -2,12 +2,12 @@
|
|||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
library path_test;
|
||||
library pathos_windows_test;
|
||||
|
||||
import 'dart:io' as io;
|
||||
|
||||
import 'package:unittest/unittest.dart';
|
||||
import 'package:path/path.dart' as path;
|
||||
import 'package:pathos/path.dart' as path;
|
||||
|
||||
main() {
|
||||
var builder = new path.Builder(style: path.Style.windows,
|
|
@ -19,9 +19,9 @@ scheduled_test/lib/*: Skip
|
|||
[ $compiler == dart2js || $compiler == dart2dart ]
|
||||
http/test/*: Skip
|
||||
oauth2/test/*: Skip
|
||||
path/test/*: Skip
|
||||
pathos/test/*: Skip
|
||||
|
||||
# Issue 8440 forces us to use path in the scheduled_test tests, which would
|
||||
# Issue 8440 forces us to use pathos in the scheduled_test tests, which would
|
||||
# otherwise be dart2js-compatible.
|
||||
scheduled_test/test/*: Skip
|
||||
|
||||
|
@ -29,7 +29,7 @@ scheduled_test/test/*: Skip
|
|||
[ $runtime == opera || $runtime == ff || $runtime == ie9 || $runtime == dartium || $runtime == chrome || $runtime == safari || $runtime == drt || $runtime == jsshell]
|
||||
http/test/*: Skip
|
||||
oauth2/test/*: Skip
|
||||
path/test/*: Skip
|
||||
pathos/test/*: Skip
|
||||
intl/test/date_time_format_file_even_test: Skip
|
||||
intl/test/date_time_format_file_odd_test: Skip
|
||||
intl/test/find_default_locale_standalone_test: Skip
|
||||
|
@ -39,7 +39,7 @@ analyzer-experimental/test/generated/scanner_test: Skip # Imports dart:io.
|
|||
analyzer-experimental/test/generated/element_test: Skip # Imports dart:io.
|
||||
analyzer-experimental/test/generated/ast_test: Skip # Imports dart:io.
|
||||
|
||||
# Issue 8440 forces us to use path in the scheduled_test tests, which would
|
||||
# Issue 8440 forces us to use pathos in the scheduled_test tests, which would
|
||||
# otherwise be dart2js-compatible.
|
||||
scheduled_test/test/*: Skip
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ library metatest;
|
|||
import 'dart:async';
|
||||
import 'dart:isolate';
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import 'package:pathos/path.dart' as path;
|
||||
import 'package:unittest/unittest.dart';
|
||||
|
||||
import 'utils.dart';
|
||||
|
|
|
@ -222,7 +222,7 @@ def Main(argv):
|
|||
# Create and populate pkg/{args, intl, logging, meta, unittest, ...}
|
||||
#
|
||||
|
||||
for library in ['args', 'http', 'intl', 'logging', 'meta', 'oauth2', 'path',
|
||||
for library in ['args', 'http', 'intl', 'logging', 'meta', 'oauth2', 'pathos',
|
||||
'serialization', 'unittest', 'yaml']:
|
||||
|
||||
copytree(join(HOME, 'pkg', library), join(PKG, library),
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
library line_doc_comments;
|
||||
import 'dart:io';
|
||||
|
||||
import '../pkg/path/lib/path.dart' as path;
|
||||
import '../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
final oneLineBlock = new RegExp(r'^(\s*)/\*\*\s?(.*)\*/\s*$');
|
||||
final startBlock = new RegExp(r'^(\s*)/\*\*(.*)$');
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
'--exclude-lib=dartdoc',
|
||||
'--exclude-lib=http',
|
||||
'--exclude-lib=oauth2',
|
||||
'--exclude-lib=path',
|
||||
'--exclude-lib=pathos',
|
||||
'--exclude-lib=webdriver',
|
||||
'--exclude-lib=yaml',
|
||||
'--include-lib=matcher',
|
||||
|
|
|
@ -11,7 +11,7 @@ import 'dart:uri';
|
|||
|
||||
import '../../pkg/args/lib/args.dart';
|
||||
import '../../pkg/http/lib/http.dart' as http;
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
import 'directory_tree.dart';
|
||||
import 'exit_codes.dart' as exit_codes;
|
||||
import 'git.dart' as git;
|
||||
|
|
|
@ -9,7 +9,7 @@ import 'dart:io';
|
|||
import 'dart:uri';
|
||||
|
||||
import '../../pkg/args/lib/args.dart';
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
import 'entrypoint.dart';
|
||||
import 'exit_codes.dart' as exit_codes;
|
||||
import 'http.dart';
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
/// A simple library for rendering a list of files as a directory tree.
|
||||
library directory_tree;
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
import 'log.dart' as log;
|
||||
|
||||
/// Draws a directory tree for the given list of files. Given a list of files
|
||||
|
|
|
@ -6,7 +6,7 @@ library entrypoint;
|
|||
|
||||
import 'dart:async';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'io.dart';
|
||||
import 'lock_file.dart';
|
||||
|
|
|
@ -6,7 +6,7 @@ library git_source;
|
|||
|
||||
import 'dart:async';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'git.dart' as git;
|
||||
import 'io.dart';
|
||||
|
|
|
@ -11,7 +11,7 @@ import 'dart:uri';
|
|||
|
||||
// TODO(nweiz): Make this import better.
|
||||
import '../../pkg/http/lib/http.dart' as http;
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'http.dart';
|
||||
import 'io.dart';
|
||||
|
|
|
@ -11,7 +11,7 @@ import 'dart:isolate';
|
|||
import 'dart:json';
|
||||
import 'dart:uri';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
import '../../pkg/http/lib/http.dart' show ByteStream;
|
||||
import 'error_group.dart';
|
||||
import 'exit_codes.dart' as exit_codes;
|
||||
|
|
|
@ -10,7 +10,7 @@ import 'dart:uri';
|
|||
|
||||
// TODO(nweiz): Make this a "package:" URL, or something nicer than this.
|
||||
import '../../pkg/oauth2/lib/oauth2.dart';
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'http.dart';
|
||||
import 'io.dart';
|
||||
|
|
|
@ -6,7 +6,7 @@ library package;
|
|||
|
||||
import 'dart:async';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'io.dart';
|
||||
import 'pubspec.dart';
|
||||
|
|
|
@ -7,7 +7,7 @@ library path_source;
|
|||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'io.dart';
|
||||
import 'package.dart';
|
||||
|
|
|
@ -10,7 +10,7 @@ import 'dart:io';
|
|||
import 'dart:math';
|
||||
|
||||
import '../../pkg/args/lib/args.dart';
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'command_help.dart';
|
||||
import 'command_install.dart';
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
library pubspec;
|
||||
|
||||
import '../../pkg/yaml/lib/yaml.dart';
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'io.dart';
|
||||
import 'package.dart';
|
||||
|
|
|
@ -7,7 +7,7 @@ library sdk;
|
|||
|
||||
import 'dart:io';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'io.dart';
|
||||
import 'log.dart' as log;
|
||||
|
|
|
@ -6,7 +6,7 @@ library sdk_source;
|
|||
|
||||
import 'dart:async';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'io.dart';
|
||||
import 'package.dart';
|
||||
|
|
|
@ -6,7 +6,7 @@ library source;
|
|||
|
||||
import 'dart:async';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'io.dart';
|
||||
import 'package.dart';
|
||||
|
|
|
@ -7,7 +7,7 @@ library system_cache;
|
|||
import 'dart:io';
|
||||
import 'dart:async';
|
||||
|
||||
import '../../pkg/path/lib/path.dart' as path;
|
||||
import '../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import 'git_source.dart';
|
||||
import 'hosted_source.dart';
|
||||
|
|
|
@ -6,7 +6,7 @@ library compiled_dartdoc_validator;
|
|||
|
||||
import 'dart:async';
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../entrypoint.dart';
|
||||
import '../io.dart';
|
||||
|
|
|
@ -6,7 +6,7 @@ library directory_validator;
|
|||
|
||||
import 'dart:async';
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../entrypoint.dart';
|
||||
import '../io.dart';
|
||||
|
|
|
@ -7,7 +7,7 @@ library lib_validator;
|
|||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../entrypoint.dart';
|
||||
import '../io.dart';
|
||||
|
|
|
@ -6,7 +6,7 @@ library pubspec_field_validator;
|
|||
|
||||
import 'dart:async';
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../entrypoint.dart';
|
||||
import '../io.dart';
|
||||
|
|
|
@ -7,7 +7,7 @@ library name_validator;
|
|||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../entrypoint.dart';
|
||||
import '../io.dart';
|
||||
|
|
|
@ -7,7 +7,7 @@ library utf8_readme_validator;
|
|||
import 'dart:async';
|
||||
import 'dart:utf';
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../entrypoint.dart';
|
||||
import '../io.dart';
|
||||
|
|
|
@ -6,7 +6,7 @@ library command_line_config;
|
|||
|
||||
import 'dart:io';
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
import '../../../pkg/unittest/lib/unittest.dart';
|
||||
import '../../pub/utils.dart';
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
library pub_tests;
|
||||
|
||||
import '../../../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../../../../pub/io.dart';
|
||||
import '../../test_pub.dart';
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
import '../../../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../../test_pub.dart';
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
import '../../../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../../../../pub/exit_codes.dart' as exit_codes;
|
||||
import '../../test_pub.dart';
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
import 'dart:io';
|
||||
|
||||
import '../../../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../../test_pub.dart';
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
import 'dart:io';
|
||||
|
||||
import '../../../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../../../../pub/exit_codes.dart' as exit_codes;
|
||||
import '../../test_pub.dart';
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
import '../../../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../../../../pub/exit_codes.dart' as exit_codes;
|
||||
import '../../test_pub.dart';
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
import '../../../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../../../../pub/exit_codes.dart' as exit_codes;
|
||||
import '../../test_pub.dart';
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
import 'dart:io';
|
||||
|
||||
import '../../../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../../../pkg/pathos/lib/path.dart' as path;
|
||||
|
||||
import '../../../../pub/exit_codes.dart' as exit_codes;
|
||||
import '../../test_pub.dart';
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
library io_test;
|
||||
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
import '../../../pkg/unittest/lib/unittest.dart';
|
||||
|
||||
import '../../pub/io.dart';
|
||||
|
|
|
@ -7,7 +7,7 @@ library pub_tests;
|
|||
import 'dart:io';
|
||||
|
||||
import 'test_pub.dart';
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
import '../../../pkg/unittest/lib/unittest.dart';
|
||||
|
||||
main() {
|
||||
|
|
|
@ -18,7 +18,7 @@ import 'dart:utf';
|
|||
|
||||
import '../../../pkg/http/lib/testing.dart';
|
||||
import '../../../pkg/oauth2/lib/oauth2.dart' as oauth2;
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
import '../../../pkg/unittest/lib/unittest.dart';
|
||||
import '../../../pkg/yaml/lib/yaml.dart';
|
||||
import '../../lib/file_system.dart' as fs;
|
||||
|
@ -430,7 +430,7 @@ String _packageName(String sourceName, description) {
|
|||
case "git":
|
||||
var url = description is String ? description : description['url'];
|
||||
// TODO(rnystrom): Using path.basename on a URL is hacky. If we add URL
|
||||
// support to pkg/path, should use an explicit builder for that.
|
||||
// support to pkg/pathos, should use an explicit builder for that.
|
||||
return path.basename(url.replaceFirst(new RegExp(r"(\.git)?/?$"), ""));
|
||||
case "hosted":
|
||||
if (description is String) return description;
|
||||
|
|
|
@ -11,7 +11,7 @@ import 'dart:math' as math;
|
|||
|
||||
import '../../../pkg/http/lib/http.dart' as http;
|
||||
import '../../../pkg/http/lib/testing.dart';
|
||||
import '../../../pkg/path/lib/path.dart' as path;
|
||||
import '../../../pkg/pathos/lib/path.dart' as path;
|
||||
import '../../../pkg/unittest/lib/unittest.dart';
|
||||
|
||||
import 'test_pub.dart';
|
||||
|
|
Loading…
Reference in a new issue