Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: pkg/docgen/lib/docgen.dart

Issue 19888005: removed docgen/test/single_library_test: Skip # Uses js_helper (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/docgen/test/single_library_test.dart » ('j') | pkg/docgen/test/single_library_test.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/docgen/lib/docgen.dart
diff --git a/pkg/docgen/lib/docgen.dart b/pkg/docgen/lib/docgen.dart
index 59c4b963b8334279cb9db2a2a70448430c5fe4ab..e4f4587d04dd1f0a0401978354d3e0fb0b625fe8 100644
--- a/pkg/docgen/lib/docgen.dart
+++ b/pkg/docgen/lib/docgen.dart
@@ -83,7 +83,7 @@ Future<bool> docgen(List<String> files, {String packageRoot,
linkResolver = (name) =>
fixReference(name, _currentLibrary, _currentClass, _currentMember);
- return getMirrorSystem(files, packageRoot, parseSdk: parseSdk)
+ return getMirrorSystem(files, packageRoot: packageRoot, parseSdk: parseSdk)
.then((MirrorSystem mirrorSystem) {
if (mirrorSystem.libraries.isEmpty) {
throw new StateError('No library mirrors were created.');
@@ -149,8 +149,8 @@ List<String> _listSdk() {
* Analyzes set of libraries by getting a mirror system and triggers the
* documentation of the libraries.
*/
-Future<MirrorSystem> getMirrorSystem(List<String> args, String packageRoot,
- {bool parseSdk:false}) {
+Future<MirrorSystem> getMirrorSystem(List<String> args, {String packageRoot,
+ bool parseSdk:false}) {
var libraries = !parseSdk ? _listLibraries(args) : _listSdk();
if (libraries.isEmpty) throw new StateError('No Libraries.');
// DART_SDK should be set to the root of the SDK library.
@@ -160,10 +160,10 @@ Future<MirrorSystem> getMirrorSystem(List<String> args, String packageRoot,
} else {
// If DART_SDK is not defined in the environment,
// assuming the dart executable is from the Dart SDK folder inside bin.
- sdkRoot = path.dirname(path.dirname(new Options().executable));
+ sdkRoot = path.join(path.dirname(path.dirname(path.dirname(path.dirname(
+ path.absolute(new Options().script))))), 'sdk');
logger.info('SDK Root: ${sdkRoot}');
}
-
return _analyzeLibraries(libraries, sdkRoot, packageRoot: packageRoot);
}
« no previous file with comments | « no previous file | pkg/docgen/test/single_library_test.dart » ('j') | pkg/docgen/test/single_library_test.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698