Merge pull request #209 from epasveer/199-add-a-way-to-set-working-di…

…rectory-when-connecting-to-remote-gdb-is-used 199 add a way to set working directory when connecting to remote gdb is used
epasveer · Dec 26, 2023 · c55fe5e · c55fe5e
2 parents 1f30513 + 17289cc
commit c55fe5e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 41 deletions.
diff --git a/src/SeerDebugDialog.cpp b/src/SeerDebugDialog.cpp
@@ -803,6 +803,8 @@ void SeerDebugDialog::handleRunModeChanged (int id) {
         executableNameToolButton->setEnabled(true);
         executableSymbolNameLineEdit->setEnabled(true);
         executableSymbolNameToolButton->setEnabled(true);
+        executableWorkingDirectoryLineEdit->setEnabled(true);
+        executableWorkingDirectoryToolButton->setEnabled(true);
         preCommandsPlainTextEdit->setPlaceholderText("gdb commands before \"attach\"");
         postCommandsPlainTextEdit->setPlaceholderText("gdb commands after \"attach\"");
     }
@@ -811,6 +813,8 @@ void SeerDebugDialog::handleRunModeChanged (int id) {
     if (id == 2) {
         executableSymbolNameLineEdit->setEnabled(true);
         executableSymbolNameToolButton->setEnabled(true);
+        executableWorkingDirectoryLineEdit->setEnabled(true);
+        executableWorkingDirectoryToolButton->setEnabled(true);
         preCommandsPlainTextEdit->setPlaceholderText("gdb commands before \"connect\"");
         postCommandsPlainTextEdit->setPlaceholderText("gdb commands after \"connect\"");
     }

diff --git a/src/SeerDebugDialog.ui b/src/SeerDebugDialog.ui
@@ -227,7 +227,7 @@
          </sizepolicy>
         </property>
         <property name="currentIndex">
-         <number>0</number>
+         <number>1</number>
         </property>
         <widget class="QWidget" name="runTab">
          <property name="sizePolicy">
@@ -492,7 +492,7 @@
          <attribute name="title">
           <string>Attach</string>
          </attribute>
-         <layout class="QGridLayout" name="gridLayout_8">
+         <layout class="QGridLayout" name="gridLayout_2">
           <item row="0" column="0">
            <layout class="QHBoxLayout" name="horizontalLayout_9">
             <item>
@@ -532,28 +532,22 @@
            </layout>
           </item>
           <item row="1" column="0">
-           <layout class="QGridLayout" name="gridLayout_2">
-            <item row="0" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_12">
+            <item>
              <widget class="QLabel" name="attachProgramPidLabel">
               <property name="text">
                <string>Process PID</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
+            <item>
              <widget class="QLineEdit" name="attachProgramPidLineEdit">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>100</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
-              <property name="maximumSize">
-               <size>
-                <width>200</width>
-                <height>16777215</height>
-               </size>
-              </property>
               <property name="toolTip">
                <string>The process pid.</string>
               </property>
@@ -568,7 +562,7 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="2">
+            <item>
              <widget class="QToolButton" name="attachProgramPidToolButton">
               <property name="toolTip">
                <string>Open a dialog to select a pid on the local system.</string>
@@ -578,37 +572,21 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="3">
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Preferred</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>468</width>
-                <height>24</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item row="1" column="3">
-             <spacer name="verticalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>418</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </item>
+          <item row="2" column="0">
+           <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>192</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="connectTab">

diff --git a/src/SeerGdbWidget.cpp b/src/SeerGdbWidget.cpp
@@ -987,6 +987,7 @@ void SeerGdbWidget::handleGdbRunExecutable (const QString& breakMode) {
             setNewExecutableFlag(false);
         }
 
+        // Set or reset some things.
         handleGdbExecutableWorkingDirectory();  // Set the program's working directory before running.
         handleGdbAssemblyDisassemblyFlavor();   // Set the disassembly flavor to use.
         handleGdbAssemblySymbolDemangling();    // Set the symbol demangling.
@@ -1863,6 +1864,8 @@ void SeerGdbWidget::handleGdbExecutableWorkingDirectory () {
         return;
     }
 
+    qDebug() << executableWorkingDirectory();
+
     if (executableWorkingDirectory() != "") {
         handleGdbCommand(QString("-environment-cd \"") + executableWorkingDirectory() + "\"");
     }

diff --git a/src/resources/help/seergdb.hlp b/src/resources/help/seergdb.hlp
@@ -42,6 +42,7 @@ Arguments:
 
 Misc Options:
 
+  --cwd, --working-dir <path>                       Set gdb's working directory path.
   --sym, --symbol-file <symbolfilename>             Load symbols from a separate file than the executable.
   --bl,  --break-load <filename>                    Load a previously saved breakpoints file. For 'run', 'start', or 'rr'.
   --bf,  --break-function <function>                Set a breakpoint in a function/address. For 'run' or 'start'.

diff --git a/src/seergdb.cpp b/src/seergdb.cpp
@@ -87,6 +87,9 @@ int main (int argc, char* argv[]) {
     QCommandLineOption configOption(QStringList() << "config");
     parser.addOption(configOption);
 
+    QCommandLineOption workingdirOption(QStringList() << "cwd" << "working-dir", "", "workingdirectory");
+    parser.addOption(workingdirOption);
+
     QCommandLineOption symbolfileOption(QStringList() << "sym" << "symbol-file", "", "symbolfile");
     parser.addOption(symbolfileOption);
 
@@ -155,6 +158,7 @@ int main (int argc, char* argv[]) {
     int     executablePid = -1;
     QString executableConnectHostPort;
     QString executableRRTraceDirectory;
+    QString executableWorkingDirectory;
     QString executableSymbolFilename;
     QString executableBreakpointsFilename;
     QString executableBreakpointFunctionName;
@@ -177,6 +181,10 @@ int main (int argc, char* argv[]) {
         breakMode  = "inmain";
     }
 
+    if (parser.isSet(workingdirOption)) {
+        executableWorkingDirectory = parser.value(workingdirOption);
+    }
+
     if (parser.isSet(symbolfileOption)) {
         executableSymbolFilename = parser.value(symbolfileOption);
     }
@@ -266,6 +274,7 @@ int main (int argc, char* argv[]) {
 
     seer.setWindowIcon(QIcon(":/seer/resources/seergdb_64x64.png"));
     seer.setExecutableName(executableName);
+    seer.setExecutableWorkingDirectory(executableWorkingDirectory);
     seer.setExecutableSymbolName(executableSymbolFilename);
     seer.setExecutableArguments(positionalArguments);
 
@@ -329,6 +338,7 @@ int main (int argc, char* argv[]) {
     }
 
     qDebug() << "EXECUTABLENAME"    << executableName;
+    qDebug() << "WORKINGDIRECTORY"  << executableWorkingDirectory;
     qDebug() << "SYMBOLNAME"        << executableSymbolFilename;
     qDebug() << "PID"               << executablePid;
     qDebug() << "CONNECTHOST"       << executableConnectHostPort;