Pub fix for Windows

utils/pub/io.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 /**
  * Helper functionality to make working with IO easier.
  */
 library io;
 
 import 'dart:io';
@@ skipping 481 matching lines @@
     args = flatten(["/c", executable, args]);
     executable = "cmd";
   }
 
   final options = new ProcessOptions();
   if (workingDir != null) {
     options.workingDirectory = _getDirectory(workingDir).path;
   }
   options.environment = environment;
 
-  final process = Process.start(executable, args, options);
-
-  final outStream = new StringInputStream(process.stdout);
-  final processStdout = <String>[];
-
-  final errStream = new StringInputStream(process.stderr);
-  final processStderr = <String>[];
-
-  final completer = new Completer<PubProcessResult>();
-
-  checkComplete() {
-    // Wait until the process is done and its output streams are closed.
-    if (!pipeStdout && !outStream.closed) return;
-    if (!pipeStderr && !errStream.closed) return;
-    if (exitCode == null) return;
-
-    completer.complete(new PubProcessResult(
-        processStdout, processStderr, exitCode));
-  }
-
-  if (pipeStdout) {
-    process.stdout.pipe(stdout, close: false);
-  } else {
-    outStream.onLine   = () => processStdout.add(outStream.readLine());
-    outStream.onClosed = checkComplete;
-    outStream.onError  = (error) => completer.completeException(error);
-  }
-
-  if (pipeStderr) {
-    process.stderr.pipe(stderr, close: false);
-  } else {
-    errStream.onLine   = () => processStderr.add(errStream.readLine());
-    errStream.onClosed = checkComplete;
-    errStream.onError  = (error) => completer.completeException(error);
-  }
-
-  process.onExit = (actualExitCode) {
-    exitCode = actualExitCode;
-    checkComplete();
-  };
-
-  process.onError = (error) => completer.completeException(error);
-
-  return completer.future;
+  var future = Process.run(executable, args, options);
+  return future.transform((result) {
+    return new PubProcessResult(result.stdout, result.stderr, result.exitCode);
+  });
 }
 
 /**
  * Wraps [input] to provide a timeout. If [input] completes before
  * [milliseconds] have passed, then the return value completes in the same way.
  * However, if [milliseconds] pass before [input] has completed, it completes
  * with a [TimeoutException] with [message].
  *
  * Note that timing out will not cancel the asynchronous operation behind
  * [input].
@@ skipping 113 matching lines @@
   // 7zip seems to periodically fail when we invoke it from Dart and tell it to
   // read from stdin instead of a file. Consider resurrecting that version if
   // we can figure out why it fails.
 
   // Find 7zip.
   var scriptPath = new File(new Options().script).fullPathSync();
   var scriptDir = new Path.fromNative(scriptPath).directoryPath;
 
   // Note: This line of code gets munged by create_sdk.py to be the correct
   // relative path to 7zip in the SDK.
-  var pathTo7zip = '../../third_party/7zip/7za.exe';
+  var pathTo7zip = '7zip/7za.exe';

[kasperl, 2012/10/16 08:01:27]

Have you double checked that this works with create_sdk.py?

[Anders Johnsen, 2012/10/16 08:03:19]

I didn't see this change. Is this intentional?

[Johnni Winther, 2012/10/16 08:08:01]

Removed.

   var command = scriptDir.append(pathTo7zip).canonicalize().toNativePath();
 
   var tempDir;
 
   return createTempDir().chain((temp) {
     // Write the archive to a temp file.
     tempDir = temp;
     return createFileFromStream(stream, join(tempDir, 'data.tar.gz'));
   }).chain((_) {
     // TODO(rnystrom): Hack. We get intermittent "file already in use" errors.
@@ skipping 95 matching lines @@
   return new Directory(entry);
 }
 
 /**
  * Gets a [Uri] for [uri], which can either already be one, or be a [String].
  */
 Uri _getUri(uri) {
   if (uri is Uri) return uri;
   return new Uri.fromString(uri);
 }