svn merge -c 13655 bleeding_edge trunk

dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/configs/DartServerLaunchConfigurationDelegate.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.tools.debug.core.configs;
 
 import com.google.dart.tools.core.DartCore;
 import com.google.dart.tools.core.model.DartSdkManager;
 import com.google.dart.tools.debug.core.DartDebugCorePlugin;
 import com.google.dart.tools.debug.core.DartLaunchConfigWrapper;
-import com.google.dart.tools.debug.core.server.ServerDebugTarget;
 import com.google.dart.tools.debug.core.util.NetUtils;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.DebugException;
@@ skipping 77 matching lines @@
           DartDebugCorePlugin.createErrorStatus("The executable path for the Dart VM has not been set."));
     }
 
     List<String> commandsList = new ArrayList<String>();
 
     int connectionPort = NetUtils.findUnusedPort(DEFAULT_PORT_NUMBER);
 
     commandsList.add(vmExecPath);
     commandsList.addAll(Arrays.asList(launchConfig.getVmArgumentsAsArray()));
 
-    if (enableDebugging && !DartCore.isWindows()) {
-      commandsList.add("--debug:" + connectionPort);
-    }
+    // BUG(5883) Debugging of standalone programs is disabled
+    // because it sometimes leads to program crashes.
+//    if (enableDebugging && !DartCore.isWindows()) {
+//      commandsList.add("--debug:" + connectionPort);
+//    }
 
     String packageRoot = DartCore.getPlugin().getPackageRootPref();
     if (packageRoot != null) {
       packageRoot = new Path(packageRoot).makeAbsolute().toOSString();
       String fileSeparator = System.getProperty("file.separator");
       if (!packageRoot.endsWith(fileSeparator)) {
         packageRoot += fileSeparator;
       }
       commandsList.add("--package-root=" + packageRoot);
     }
@@ skipping 38 matching lines @@
       if (runtimeProcess != null) {
         runtimeProcess.destroy();
       }
 
       throw new CoreException(
           DartDebugCorePlugin.createErrorStatus("Error starting Dart VM process"));
     }
 
     eclipseProcess.setAttribute(IProcess.ATTR_CMDLINE, generateCommandLine(commands));
 
-    if (enableDebugging && !DartCore.isWindows()) {
-      ServerDebugTarget debugTarget = new ServerDebugTarget(launch, eclipseProcess, connectionPort);
-
-      try {
-        debugTarget.connect();
-
-        launch.addDebugTarget(debugTarget);
-      } catch (DebugException ex) {
-        // We don't throw an exception if the process died before we could connect.
-        if (!isProcessDead(runtimeProcess)) {
-          throw ex;
-        }
-      }
-    }
+    // BUG(5883) Debugging of standalone programs is disabled
+    // because it sometimes leads to program crashes.
+//    if (enableDebugging && !DartCore.isWindows()) {
+//      ServerDebugTarget debugTarget = new ServerDebugTarget(launch, eclipseProcess, connectionPort);
+//
+//      try {
+//        debugTarget.connect();
+//
+//        launch.addDebugTarget(debugTarget);
+//      } catch (DebugException ex) {
+//        // We don't throw an exception if the process died before we could connect.
+//        if (!isProcessDead(runtimeProcess)) {
+//          throw ex;
+//        }
+//      }
+//    }
 
     monitor.done();
   }
 
   private String describe(ProcessBuilder processBuilder) {
     StringBuilder builder = new StringBuilder();
 
     for (String arg : processBuilder.command()) {
       // Showing the --debug option doesn't provide a lot of value.
       if (arg.startsWith("--debug")) {
@@ skipping 151 matching lines @@
         return process.getOutputStream();
       }
 
       @Override
       public int waitFor() throws InterruptedException {
         return process.waitFor();
       }
     };
   }
 }