1.1 --- a/cnd.debugger.gdbserver/nbproject/project.xml Mon Jun 16 09:38:04 2014 +0200
1.2 +++ b/cnd.debugger.gdbserver/nbproject/project.xml Wed Jun 25 13:35:02 2014 +0400
1.3 @@ -29,7 +29,7 @@
1.4 <compile-dependency/>
1.5 <run-dependency>
1.6 <release-version>3</release-version>
1.7 - <specification-version>3.1.0.3</specification-version>
1.8 + <specification-version>3.25.2</specification-version>
1.9 </run-dependency>
1.10 </dependency>
1.11 <dependency>
1.12 @@ -38,7 +38,7 @@
1.13 <compile-dependency/>
1.14 <run-dependency>
1.15 <release-version>1</release-version>
1.16 - <specification-version>1.5</specification-version>
1.17 + <specification-version>1.20.1</specification-version>
1.18 </run-dependency>
1.19 </dependency>
1.20 <dependency>
2.1 --- a/cnd.debugger.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java Mon Jun 16 09:38:04 2014 +0200
2.2 +++ b/cnd.debugger.gdbserver/src/org/netbeans/modules/cnd/debugger/gdbserver/GdbServerAttachPanel.java Wed Jun 25 13:35:02 2014 +0400
2.3 @@ -51,12 +51,13 @@
2.4 import java.beans.PropertyChangeListener;
2.5 import javax.swing.JPanel;
2.6 import org.netbeans.modules.cnd.api.remote.RemoteSyncSupport;
2.7 +import org.netbeans.modules.cnd.debugger.common2.debugger.NativeDebuggerInfo;
2.8 import org.netbeans.modules.cnd.debugger.common2.debugger.NativeDebuggerManager;
2.9 import org.netbeans.modules.cnd.debugger.common2.debugger.actions.ExecutableProjectPanel;
2.10 import org.netbeans.modules.cnd.debugger.common2.debugger.actions.ExecutableProjectPanel.ProjectCBItem;
2.11 import org.netbeans.modules.cnd.debugger.common2.debugger.debugtarget.DebugTarget;
2.12 import org.netbeans.modules.cnd.debugger.common2.debugger.remote.CndRemote;
2.13 -import org.netbeans.modules.cnd.debugger.gdb2.GdbDebuggerInfo;
2.14 +import org.netbeans.modules.cnd.debugger.gdb2.options.GdbDebuggerInfoFactory;
2.15 import org.netbeans.modules.cnd.makeproject.api.configurations.ConfigurationSupport;
2.16 import org.netbeans.modules.cnd.makeproject.api.configurations.MakeConfiguration;
2.17 import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
2.18 @@ -168,13 +169,8 @@
2.19 dt.setExecutable(path);
2.20
2.21 // always use gdb
2.22 - GdbDebuggerInfo gdi = GdbDebuggerInfo.create();
2.23 - gdi.setDebugTarget(dt);
2.24 - gdi.setHostName(CndRemote.userhostFromConfiguration(conf));
2.25 - gdi.setConfiguration(conf);
2.26 - gdi.setAction(NativeDebuggerManager.ATTACH);
2.27 - gdi.setTargetCommand(targetValue);
2.28 -
2.29 + NativeDebuggerInfo gdi = GdbDebuggerInfoFactory.create(dt,
2.30 + CndRemote.userhostFromConfiguration(conf), conf, NativeDebuggerManager.ATTACH, targetValue);
2.31 NativeDebuggerManager.get().debugNoAsk(gdi);
2.32 // try {
2.33 // GdbDebugger.attachGdbServer(target, pi.getProjectInformation());