1.1 --- a/cnd.gdbserver/nbproject/genfiles.properties	Fri Feb 18 15:07:28 2011 -0800
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,8 +0,0 @@
     1.4 -build.xml.data.CRC32=36687699
     1.5 -build.xml.script.CRC32=e0335d2d
     1.6 -build.xml.stylesheet.CRC32=a56c6a5b@1.44.1
     1.7 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     1.8 -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     1.9 -nbproject/build-impl.xml.data.CRC32=36687699
    1.10 -nbproject/build-impl.xml.script.CRC32=fe464ee1
    1.11 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.44.1

     2.1 --- a/cnd.gdbserver/nbproject/project.xml	Fri Feb 18 15:07:28 2011 -0800
     2.2 +++ b/cnd.gdbserver/nbproject/project.xml	Mon Feb 21 16:13:12 2011 -0800
     2.3 @@ -7,6 +7,15 @@
     2.4              <standalone/>
     2.5              <module-dependencies>
     2.6                  <dependency>
     2.7 +                    <code-name-base>org.netbeans.api.debugger</code-name-base>
     2.8 +                    <build-prerequisite/>
     2.9 +                    <compile-dependency/>
    2.10 +                    <run-dependency>
    2.11 +                        <release-version>1</release-version>
    2.12 +                        <specification-version>1.30</specification-version>
    2.13 +                    </run-dependency>
    2.14 +                </dependency>
    2.15 +                <dependency>
    2.16                      <code-name-base>org.netbeans.modules.cnd.debugger.common2</code-name-base>
    2.17                      <build-prerequisite/>
    2.18                      <compile-dependency/>
    2.19 @@ -16,6 +25,24 @@
    2.20                      </run-dependency>
    2.21                  </dependency>
    2.22                  <dependency>
    2.23 +                    <code-name-base>org.netbeans.modules.cnd.debugger.gdb2</code-name-base>
    2.24 +                    <build-prerequisite/>
    2.25 +                    <compile-dependency/>
    2.26 +                    <run-dependency>
    2.27 +                        <release-version>1</release-version>
    2.28 +                        <specification-version>1.1.0.1</specification-version>
    2.29 +                    </run-dependency>
    2.30 +                </dependency>
    2.31 +                <dependency>
    2.32 +                    <code-name-base>org.netbeans.modules.cnd.makeproject</code-name-base>
    2.33 +                    <build-prerequisite/>
    2.34 +                    <compile-dependency/>
    2.35 +                    <run-dependency>
    2.36 +                        <release-version>1</release-version>
    2.37 +                        <specification-version>1.14.0.1</specification-version>
    2.38 +                    </run-dependency>
    2.39 +                </dependency>
    2.40 +                <dependency>
    2.41                      <code-name-base>org.netbeans.modules.projectapi</code-name-base>
    2.42                      <build-prerequisite/>
    2.43                      <compile-dependency/>

     3.1 --- a/cnd.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java	Fri Feb 18 15:07:28 2011 -0800
     3.2 +++ b/cnd.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java	Mon Feb 21 16:13:12 2011 -0800
     3.3 @@ -49,12 +49,14 @@
     3.4  package org.netbeans.modules.cnd.debugger.gdbserver;
     3.5  
     3.6  import java.beans.PropertyChangeListener;
     3.7 +import org.netbeans.modules.cnd.debugger.common2.debugger.DebuggerManager;
     3.8  import org.netbeans.modules.cnd.debugger.common2.debugger.actions.ExecutableProjectPanel;
     3.9  import org.netbeans.modules.cnd.debugger.common2.debugger.actions.ExecutableProjectPanel.ProjectCBItem;
    3.10 +import org.netbeans.modules.cnd.debugger.common2.debugger.debugtarget.DebugTarget;
    3.11 +import org.netbeans.modules.cnd.debugger.gdb2.GdbDebuggerInfo;
    3.12 +import org.netbeans.modules.cnd.makeproject.api.configurations.ConfigurationSupport;
    3.13 +import org.netbeans.modules.cnd.makeproject.api.configurations.MakeConfiguration;
    3.14  import org.netbeans.spi.debugger.ui.Controller;
    3.15 -import org.openide.DialogDisplayer;
    3.16 -import org.openide.NotifyDescriptor;
    3.17 -import org.openide.util.NbBundle;
    3.18  import org.openide.util.NbPreferences;
    3.19  
    3.20  /**
    3.21 @@ -171,7 +173,20 @@
    3.22  
    3.23              ProjectCBItem pi = (ProjectCBItem) projectCB.getSelectedItem();
    3.24              if (pi != null) {
    3.25 -                String target = hostValue + ':' + portValue;
    3.26 +                MakeConfiguration conf = ConfigurationSupport.getProjectActiveConfiguration(pi.getProject()).clone();
    3.27 +                DebugTarget dt = new DebugTarget(conf);
    3.28 +                String path = conf.getAbsoluteOutputValue().replace("\\", "/"); // NOI18N
    3.29 +                dt.setExecutable(path);
    3.30 +
    3.31 +                // always use gdb
    3.32 +                GdbDebuggerInfo gdi = GdbDebuggerInfo.create();
    3.33 +                gdi.setDebugTarget(dt);
    3.34 +                gdi.setHostName("localhost"); //NOI18N
    3.35 +                gdi.setConfiguration(conf);
    3.36 +                gdi.setAction(DebuggerManager.ATTACH);
    3.37 +                gdi.setRemoteTarget(hostValue + ':' + portValue);
    3.38 +                
    3.39 +                DebuggerManager.get().debugNoAsk(gdi);
    3.40  //                try {
    3.41  //                    GdbDebugger.attachGdbServer(target, pi.getProjectInformation());
    3.42  //                } catch (DebuggerStartException dse) {