#664 Update the Linux debugger launch scripts to new API

hemelb-codes · Apr 2, 2014 · 637548d · 637548d
1 parent a616daa
commit 637548d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/Code/debug/linux/LinuxDebugger.cc b/Code/debug/linux/LinuxDebugger.cc
@@ -29,13 +29,6 @@ namespace hemelb
       return debugLinuxDir + "/launchGdbs.sh";
     }
 
-    const std::string LinuxDebugger::GetPlatformGdbScript(void) const {
-      std::string include (__FILE__);
-      std::string debugLinuxDir = include.substr(0, include.rfind('/'));
-
-      return debugLinuxDir + "/resume.gdb";
-    }
-
     Debugger* PlatformDebuggerFactory(const char * const executable, const net::MpiCommunicator& comm) {
       return new LinuxDebugger(executable, comm);
     }

diff --git a/Code/debug/linux/LinuxDebugger.h b/Code/debug/linux/LinuxDebugger.h
@@ -22,7 +22,6 @@ namespace hemelb
       // Platform specific getters
       const std::string GetPlatformInterpreter(void) const;
       const std::string GetPlatformScript(void) const;
-      const std::string GetPlatformGdbScript(void) const;
 
       // C'tor...
       LinuxDebugger(const char* const executable, const net::MpiCommunicator& comm);

diff --git a/Code/debug/linux/launchGnomeTerminal.sh b/Code/debug/linux/launchGnomeTerminal.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
-
-debuggerCommandFile=$1
+DIR=$(dirname "$0")
+debuggerCommandFile=$DIR/resume.gdb
 binary=$2
 debugger="gdb -q -x $debuggerCommandFile $binary"
 
-shift 2 
+shift
 # Remove the first to params.
 # Positional params now hold the process ids we
 # want to attach to.

diff --git a/Code/debug/linux/launchKonsole.sh b/Code/debug/linux/launchKonsole.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
-
-debuggerCommandFile=$1
-binary=$2
+DIR=$(dirname "$0")
+debuggerCommandFile=$DIR/resume.gdb
+binary=$1
 debugger="gdb -q -x $debuggerCommandFile $binary"
 
-shift 2 
+shift
 # Remove the first to params.
 # Positional params now hold the process ids we
 # want to attach to.