conversion to the cmake building system #4

I'd like the user to entry the name for the log file (GDB_TRANSCRIPT) but I've got no clue how to do It.

Because we definitely don't want to lose the great work Greg did on CMake conversion, I made an rebase to the current head and reopened it so we can continue in work and finish it.

My only concern is with the GDB_TRANSCRIPT definition, I'm not sure It's the right way to do It.

We shall see what Slavek Senpai says about this. 😅

@MicheleC If you have some spare time, can you have a look at removing the TQT_NO_COMPAT definition?

@MicheleC If you have some spare time, can you have a look at removing the TQT_NO_COMPAT definition?

Just for reference, that was done already 👍

@SlavekB I'd like to include Michele patch against the TQT_NO_COMPAT definition after you have reviewed and commented the cmake conversion, this should spare me from rebasing/reordering regularly during the reviewing process.

patch from @MicheleC to get rid of some deprecated, I leave it there.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e818ab..13125e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ include( ConfigureChecks.cmake )
 
 ###### global compiler settings
 
-add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST -UTQT_NO_COMPAT )
+add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST -DTQT_NO_COMPAT )
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
diff --git a/kdbg/gdbdriver.cpp b/kdbg/gdbdriver.cpp
index 933c191..a7f450f 100644
--- a/kdbg/gdbdriver.cpp
+++ b/kdbg/gdbdriver.cpp
@@ -358,9 +358,9 @@ void GdbDriver::parseMarker()
     // extract filename and line number
     static TQRegExp MarkerRE(":[0-9]+:[0-9]+:[begmidl]+:0x");
 
-    int len;
-    int lineNoStart = MarkerRE.match(startMarker, 0, &len);
+    int lineNoStart = MarkerRE.search(startMarker, 0);
     if (lineNoStart >= 0) {
+			int len = MarkerRE.matchedLength();
 	int lineNo = atoi(startMarker + lineNoStart+1);
 
 	// get address
diff --git a/kdbg/xsldbgdriver.cpp b/kdbg/xsldbgdriver.cpp
index 63b3227..3497121 100644
--- a/kdbg/xsldbgdriver.cpp
+++ b/kdbg/xsldbgdriver.cpp
@@ -294,7 +294,7 @@ XsldbgDriver::parseMarker()
 
     // TRACE("parseMarker : xsldbg");
     //  TRACE(m_output);
-    int len, markerStart = -1;
+    int len = 0, markerStart = -1;
     char *p = m_output;
 
     while (markerStart == -1) {
@@ -303,13 +303,16 @@ XsldbgDriver::parseMarker()
             return;
         }
         //TRACE(TQString("parseMarker is looking at :") + p);
-        markerStart = m_markerRE.match(p, 0, &len);
+        markerStart = m_markerRE.search(p, 0);
         if (markerStart == -1) {
             // try to marker on next line !
             p = strchr(p, '\n');
             if ((p != 0) && (*p != '\0'))
                 p++;
         }
+				else {
+					len = m_markerRE.matchedLength();
+				}
     }
 
 
@@ -327,7 +330,8 @@ XsldbgDriver::parseMarker()
     // extract filename and line number
     static TQRegExp MarkerRE(" at line [0-9]+");
 
-    int lineNoStart = MarkerRE.match(startMarker, 0, &len);
+		len = 0;
+    int lineNoStart = MarkerRE.search(startMarker, 0);
 
     if (lineNoStart >= 0) {
         int lineNo = atoi(startMarker + lineNoStart + 8);
@@ -1317,7 +1321,7 @@ XsldbgDriver::parseChangeExecutable(const char *output, TQString & message)
      * message (no debugging symbols found)...
      */
     TQRegExp exp(".*Load of source deferred. Use the run command.*");
-    int len, index = exp.match(output, 0, &len);
+    int index = exp.search(output, 0);
 
     if (index != -1) {
         TRACE("Parsed stylesheet executable");
@@ -1332,7 +1336,7 @@ XsldbgDriver::parseCoreFile(const char *output)
     TRACE("XsldbgDriver::parseCoreFile");
     TRACE(output);
     TQRegExp exp(".*Load of data file deferred. Use the run command.*");
-    int len, index = exp.match(output, 0, &len);
+    int index = exp.search(output, 0);
 
     if (index != -1) {
         m_haveCoreFile = true;

patch from @MicheleC to get rid of some deprecated, I leave it there. ``` diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e818ab..13125e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST -UTQT_NO_COMPAT ) +add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST -DTQT_NO_COMPAT ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/kdbg/gdbdriver.cpp b/kdbg/gdbdriver.cpp index 933c191..a7f450f 100644 --- a/kdbg/gdbdriver.cpp +++ b/kdbg/gdbdriver.cpp @@ -358,9 +358,9 @@ void GdbDriver::parseMarker() // extract filename and line number static TQRegExp MarkerRE(":[0-9]+:[0-9]+:[begmidl]+:0x"); - int len; - int lineNoStart = MarkerRE.match(startMarker, 0, &len); + int lineNoStart = MarkerRE.search(startMarker, 0); if (lineNoStart >= 0) { + int len = MarkerRE.matchedLength(); int lineNo = atoi(startMarker + lineNoStart+1); // get address diff --git a/kdbg/xsldbgdriver.cpp b/kdbg/xsldbgdriver.cpp index 63b3227..3497121 100644 --- a/kdbg/xsldbgdriver.cpp +++ b/kdbg/xsldbgdriver.cpp @@ -294,7 +294,7 @@ XsldbgDriver::parseMarker() // TRACE("parseMarker : xsldbg"); // TRACE(m_output); - int len, markerStart = -1; + int len = 0, markerStart = -1; char *p = m_output; while (markerStart == -1) { @@ -303,13 +303,16 @@ XsldbgDriver::parseMarker() return; } //TRACE(TQString("parseMarker is looking at :") + p); - markerStart = m_markerRE.match(p, 0, &len); + markerStart = m_markerRE.search(p, 0); if (markerStart == -1) { // try to marker on next line ! p = strchr(p, '\n'); if ((p != 0) && (*p != '\0')) p++; } + else { + len = m_markerRE.matchedLength(); + } } @@ -327,7 +330,8 @@ XsldbgDriver::parseMarker() // extract filename and line number static TQRegExp MarkerRE(" at line [0-9]+"); - int lineNoStart = MarkerRE.match(startMarker, 0, &len); + len = 0; + int lineNoStart = MarkerRE.search(startMarker, 0); if (lineNoStart >= 0) { int lineNo = atoi(startMarker + lineNoStart + 8); @@ -1317,7 +1321,7 @@ XsldbgDriver::parseChangeExecutable(const char *output, TQString & message) * message (no debugging symbols found)... */ TQRegExp exp(".*Load of source deferred. Use the run command.*"); - int len, index = exp.match(output, 0, &len); + int index = exp.search(output, 0); if (index != -1) { TRACE("Parsed stylesheet executable"); @@ -1332,7 +1336,7 @@ XsldbgDriver::parseCoreFile(const char *output) TRACE("XsldbgDriver::parseCoreFile"); TRACE(output); TQRegExp exp(".*Load of data file deferred. Use the run command.*"); - int len, index = exp.match(output, 0, &len); + int index = exp.search(output, 0); if (index != -1) { m_haveCoreFile = true; ```

I haven't done the test yet, but after the first review, here are only a minimum of comments.

patch from @MicheleC to get rid of some deprecated, I leave it there.

Hi Greg, just wonder why you have not applied this to the code. Anything unclear or not working from the patch?

I'm a little confused about TQT_NO_COMPAT. I tried to give away -UTQT_NO_COMPAT and without doing any further change, build was successful. It is not clear to me whether the above patch is needed?

I'm a little confused about TQT_NO_COMPAT. I tried to give away -UTQT_NO_COMPAT and without doing any further change, build was successful. It is not clear to me whether the above patch is needed?

Ignore it – I forgot to update deb rules to be used cmake :)

It looks good. There seems nothing to prevent it from becoming part of R14.0.10. I added patches to resolve TQT_NO_COMPAT and TQT_NO_ASCII_CAST. Please test it on your system.

Nice to see a PR that almost got lost 2 years ago making it into master code soon 😄

For us nothing is lost – sooner or later it is processed 😺

 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
 option( WITH_TRACE_OUTPUT   "Generate lots of trace output" OFF )
 option( WITH_GDB_TRANSCRIPT "Provide file log" OFF )
 option( BUILD_TESTPROGS     "Build testprogs executables" OFF )

				`############################################`


				`cmake_minimum_required( VERSION 2.8 )`