1.1 --- a/cnd.debugger.gdbserver/nbproject/project.xml	Sat Feb 19 10:53:48 2011 -0500
     1.2 +++ b/cnd.debugger.gdbserver/nbproject/project.xml	Mon Feb 21 16:14:07 2011 -0800
     1.3 @@ -6,6 +6,15 @@
     1.4              <code-name-base>org.netbeans.modules.cnd.debugger.gdbserver</code-name-base>
     1.5              <module-dependencies>
     1.6                  <dependency>
     1.7 +                    <code-name-base>org.netbeans.api.debugger</code-name-base>
     1.8 +                    <build-prerequisite/>
     1.9 +                    <compile-dependency/>
    1.10 +                    <run-dependency>
    1.11 +                        <release-version>1</release-version>
    1.12 +                        <specification-version>1.30</specification-version>
    1.13 +                    </run-dependency>
    1.14 +                </dependency>
    1.15 +                <dependency>
    1.16                      <code-name-base>org.netbeans.modules.cnd.debugger.common2</code-name-base>
    1.17                      <build-prerequisite/>
    1.18                      <compile-dependency/>
    1.19 @@ -15,6 +24,24 @@
    1.20                      </run-dependency>
    1.21                  </dependency>
    1.22                  <dependency>
    1.23 +                    <code-name-base>org.netbeans.modules.cnd.debugger.gdb2</code-name-base>
    1.24 +                    <build-prerequisite/>
    1.25 +                    <compile-dependency/>
    1.26 +                    <run-dependency>
    1.27 +                        <release-version>1</release-version>
    1.28 +                        <specification-version>1.1.0.1</specification-version>
    1.29 +                    </run-dependency>
    1.30 +                </dependency>
    1.31 +                <dependency>
    1.32 +                    <code-name-base>org.netbeans.modules.cnd.makeproject</code-name-base>
    1.33 +                    <build-prerequisite/>
    1.34 +                    <compile-dependency/>
    1.35 +                    <run-dependency>
    1.36 +                        <release-version>1</release-version>
    1.37 +                        <specification-version>1.14.0.1</specification-version>
    1.38 +                    </run-dependency>
    1.39 +                </dependency>
    1.40 +                <dependency>
    1.41                      <code-name-base>org.netbeans.modules.projectapi</code-name-base>
    1.42                      <build-prerequisite/>
    1.43                      <compile-dependency/>

     2.1 --- a/cnd.debugger.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java	Sat Feb 19 10:53:48 2011 -0500
     2.2 +++ b/cnd.debugger.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java	Mon Feb 21 16:14:07 2011 -0800
     2.3 @@ -49,12 +49,14 @@
     2.4  package org.netbeans.modules.cnd.debugger.gdbserver;
     2.5  
     2.6  import java.beans.PropertyChangeListener;
     2.7 +import org.netbeans.modules.cnd.debugger.common2.debugger.DebuggerManager;
     2.8  import org.netbeans.modules.cnd.debugger.common2.debugger.actions.ExecutableProjectPanel;
     2.9  import org.netbeans.modules.cnd.debugger.common2.debugger.actions.ExecutableProjectPanel.ProjectCBItem;
    2.10 +import org.netbeans.modules.cnd.debugger.common2.debugger.debugtarget.DebugTarget;
    2.11 +import org.netbeans.modules.cnd.debugger.gdb2.GdbDebuggerInfo;
    2.12 +import org.netbeans.modules.cnd.makeproject.api.configurations.ConfigurationSupport;
    2.13 +import org.netbeans.modules.cnd.makeproject.api.configurations.MakeConfiguration;
    2.14  import org.netbeans.spi.debugger.ui.Controller;
    2.15 -import org.openide.DialogDisplayer;
    2.16 -import org.openide.NotifyDescriptor;
    2.17 -import org.openide.util.NbBundle;
    2.18  import org.openide.util.NbPreferences;
    2.19  
    2.20  /**
    2.21 @@ -171,7 +173,20 @@
    2.22  
    2.23              ProjectCBItem pi = (ProjectCBItem) projectCB.getSelectedItem();
    2.24              if (pi != null) {
    2.25 -                String target = hostValue + ':' + portValue;
    2.26 +                MakeConfiguration conf = ConfigurationSupport.getProjectActiveConfiguration(pi.getProject()).clone();
    2.27 +                DebugTarget dt = new DebugTarget(conf);
    2.28 +                String path = conf.getAbsoluteOutputValue().replace("\\", "/"); // NOI18N
    2.29 +                dt.setExecutable(path);
    2.30 +
    2.31 +                // always use gdb
    2.32 +                GdbDebuggerInfo gdi = GdbDebuggerInfo.create();
    2.33 +                gdi.setDebugTarget(dt);
    2.34 +                gdi.setHostName("localhost"); //NOI18N
    2.35 +                gdi.setConfiguration(conf);
    2.36 +                gdi.setAction(DebuggerManager.ATTACH);
    2.37 +                gdi.setRemoteTarget(hostValue + ':' + portValue);
    2.38 +                
    2.39 +                DebuggerManager.get().debugNoAsk(gdi);
    2.40  //                try {
    2.41  //                    GdbDebugger.attachGdbServer(target, pi.getProjectInformation());
    2.42  //                } catch (DebuggerStartException dse) {