implement debugger_args option

This commit is contained in:
Mrmaxmeier 2016-12-11 21:24:55 +01:00
commit c831c4d4e4
4 changed files with 15 additions and 8 deletions

View file

@ -27,7 +27,7 @@ function couldBeOutput(line: string) {
const trace = false;
export class MI2 extends EventEmitter implements IBackend {
constructor(public application: string, public preargs: string[]) {
constructor(public application: string, public preargs: string[], public extraargs: string[]) {
super();
}
@ -36,7 +36,8 @@ export class MI2 extends EventEmitter implements IBackend {
target = nativePath.join(cwd, target);
return new Promise((resolve, reject) => {
this.isSSH = false;
this.process = ChildProcess.spawn(this.application, this.preargs, { cwd: cwd });
let args = this.preargs.concat(this.extraargs || []);
this.process = ChildProcess.spawn(this.application, args, { cwd: cwd });
this.process.stdout.on("data", this.stdout.bind(this));
this.process.stderr.on("data", this.stderr.bind(this));
this.process.on("exit", (() => { this.emit("quit"); }).bind(this));

View file

@ -8,6 +8,7 @@ export interface LaunchRequestArguments {
cwd: string;
target: string;
gdbpath: string;
debugger_args: string[];
arguments: string;
terminal: string;
autorun: string[];
@ -20,6 +21,7 @@ export interface AttachRequestArguments {
cwd: string;
target: string;
gdbpath: string;
debugger_args: string[];
executable: string;
remote: boolean;
autorun: string[];
@ -40,7 +42,7 @@ class GDBDebugSession extends MI2DebugSession {
}
protected launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): void {
this.miDebugger = new MI2(args.gdbpath || "gdb", ["-q", "--interpreter=mi2"]);
this.miDebugger = new MI2(args.gdbpath || "gdb", ["-q", "--interpreter=mi2"], args.debugger_args);
this.initDebugger();
this.quit = false;
this.attached = false;
@ -109,7 +111,7 @@ class GDBDebugSession extends MI2DebugSession {
}
protected attachRequest(response: DebugProtocol.AttachResponse, args: AttachRequestArguments): void {
this.miDebugger = new MI2(args.gdbpath || "gdb", ["-q", "--interpreter=mi2"]);
this.miDebugger = new MI2(args.gdbpath || "gdb", ["-q", "--interpreter=mi2"], args.debugger_args);
this.initDebugger();
this.quit = false;
this.attached = !args.remote;

View file

@ -8,6 +8,7 @@ export interface LaunchRequestArguments {
cwd: string;
target: string;
lldbmipath: string;
debugger_args: string[];
arguments: string;
autorun: string[];
ssh: SSHArguments;
@ -19,6 +20,7 @@ export interface AttachRequestArguments {
cwd: string;
target: string;
lldbmipath: string;
debugger_args: string[];
executable: string;
autorun: string[];
printCalls: boolean;
@ -36,7 +38,7 @@ class LLDBDebugSession extends MI2DebugSession {
}
protected launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): void {
this.miDebugger = new MI2_LLDB(args.lldbmipath || "lldb-mi", []);
this.miDebugger = new MI2_LLDB(args.lldbmipath || "lldb-mi", [], args.debugger_args);
this.initDebugger();
this.quit = false;
this.attached = false;
@ -97,7 +99,7 @@ class LLDBDebugSession extends MI2DebugSession {
}
protected attachRequest(response: DebugProtocol.AttachResponse, args: AttachRequestArguments): void {
this.miDebugger = new MI2_LLDB(args.lldbmipath || "lldb-mi", []);
this.miDebugger = new MI2_LLDB(args.lldbmipath || "lldb-mi", [], args.debugger_args);
this.initDebugger();
this.quit = false;
this.attached = true;

View file

@ -8,6 +8,7 @@ export interface LaunchRequestArguments {
cwd: string;
target: string;
magomipath: string;
debugger_args: string[];
arguments: string;
autorun: string[];
printCalls: boolean;
@ -18,6 +19,7 @@ export interface AttachRequestArguments {
cwd: string;
target: string;
magomipath: string;
debugger_args: string[];
executable: string;
autorun: string[];
printCalls: boolean;
@ -43,7 +45,7 @@ class MagoDebugSession extends MI2DebugSession {
}
protected launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): void {
this.miDebugger = new MI2_Mago(args.magomipath || "mago-mi", ["-q"]);
this.miDebugger = new MI2_Mago(args.magomipath || "mago-mi", ["-q"], args.debugger_args);
this.initDebugger();
this.quit = false;
this.attached = false;
@ -72,7 +74,7 @@ class MagoDebugSession extends MI2DebugSession {
}
protected attachRequest(response: DebugProtocol.AttachResponse, args: AttachRequestArguments): void {
this.miDebugger = new MI2_Mago(args.magomipath || "mago-mi", []);
this.miDebugger = new MI2_Mago(args.magomipath || "mago-mi", [], args.debugger_args);
this.initDebugger();
this.quit = false;
this.attached = true;