reenabling disconnect on timeout for iodevice connections

[quassel.git] / src / common / quassel.cpp

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 9761bfb..f1d37c5 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -35,6 +35,7 @@
 #include "syncableobject.h"
 
 #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+#  define BUILD_CRASHHANDLER
 #  include <execinfo.h>
 #  include <dlfcn.h>
 #  include <cxxabi.h>
@@ -47,11 +48,13 @@ bool Quassel::_initialized = false;
 bool Quassel::DEBUG = false;
 
 Quassel::Quassel() {
+  Q_INIT_RESOURCE(i18n);
+
   // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
   signal(SIGTERM, handleSignal);
   signal(SIGINT, handleSignal);
 
-#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+#ifdef BUILD_CRASHHANDLER
   signal(SIGABRT, handleSignal);
   signal(SIGBUS, handleSignal);
   signal(SIGSEGV, handleSignal);
@@ -74,8 +77,6 @@ bool Quassel::init() {
   qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
   registerMetaTypes();
-  setupBuildInfo();
-  Global::setupVersion();
   setupTranslations();
 
   QCoreApplication::setApplicationName(buildInfo().applicationName);
@@ -144,30 +145,60 @@ void Quassel::setupTranslations() {
   qApp->installTranslator(quasselTranslator);
 }
 
-void Quassel::setupBuildInfo() {
+void Quassel::setupBuildInfo(const QString &generated) {
   _buildInfo.applicationName = "Quassel IRC";
   _buildInfo.coreApplicationName = "Quassel Core";
   _buildInfo.clientApplicationName = "Quassel Client";
   _buildInfo.organizationName = "Quassel Project";
   _buildInfo.organizationDomain = "quassel-irc.org";
-/*
-#  include "version.inc"
-#  include "version.gen"
-
-  if(quasselGeneratedVersion.isEmpty()) {
-    if(quasselCommit.isEmpty())
-      quasselVersion = QString("v%1 (unknown rev)").arg(quasselBaseVersion);
-    else
-      quasselVersion = QString("v%1 (dist-%2, %3)").arg(quasselBaseVersion).arg(quasselCommit.left(7))
-      .arg(QDateTime::fromTime_t(quasselArchiveDate).toLocalTime().toString("yyyy-MM-dd"));
+
+  QStringList gen = generated.split(',');
+  Q_ASSERT(gen.count() == 10);
+  _buildInfo.baseVersion = gen[0];
+  _buildInfo.generatedVersion = gen[1];
+  _buildInfo.isSourceDirty = !gen[2].isEmpty();
+  _buildInfo.commitHash = gen[3];
+  _buildInfo.commitDate = gen[4].toUInt();
+  _buildInfo.protocolVersion = gen[5].toUInt();
+  _buildInfo.clientNeedsProtocol = gen[6].toUInt();
+  _buildInfo.coreNeedsProtocol = gen[7].toUInt();
+  _buildInfo.buildDate = QString("%1 %2").arg(gen[8], gen[9]);
+  // create a nice version string
+  if(_buildInfo.generatedVersion.isEmpty()) {
+    if(!_buildInfo.commitHash.isEmpty()) {
+      // dist version
+      _buildInfo.plainVersionString = QString("v%1 (dist-%2)")
+                                        .arg(_buildInfo.baseVersion)
+                                        .arg(_buildInfo.commitHash.left(7));
+                                        _buildInfo.fancyVersionString
+                                           = QString("v%1 (dist-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%3\">%2</a>)")
+                                        .arg(_buildInfo.baseVersion)
+                                        .arg(_buildInfo.commitHash.left(7))
+                                        .arg(_buildInfo.commitHash);
+    } else {
+    // we only have a base version :(
+      _buildInfo.plainVersionString = QString("v%1 (unknown rev)").arg(_buildInfo.baseVersion);
+    }
   } else {
-    QStringList parts = quasselGeneratedVersion.split(':');
-    quasselVersion = QString("v%1").arg(parts[0]);
-    if(parts.count() >= 2) quasselVersion.append(QString(" (%1)").arg(parts[1]));
+    // analyze what we got from git-describe
+    QRegExp rx("(.*)-(\\d+)-g([0-9a-f]+)$");
+    if(rx.exactMatch(_buildInfo.generatedVersion)) {
+      QString distance = rx.cap(2) == "0" ? QString() : QString(" [+%1]").arg(rx.cap(2));
+      _buildInfo.plainVersionString = QString("v%1%2 (git-%3%4)")
+                                        .arg(rx.cap(1), distance, rx.cap(3))
+                                        .arg(_buildInfo.isSourceDirty ? "*" : "");
+      if(!_buildInfo.commitHash.isEmpty()) {
+        _buildInfo.fancyVersionString = QString("v%1%2 (git-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%5\">%3</a>%4)")
+                                          .arg(rx.cap(1), distance, rx.cap(3))
+                                          .arg(_buildInfo.isSourceDirty ? "*" : "")
+                                          .arg(_buildInfo.commitHash);
+      }
+    } else {
+      _buildInfo.plainVersionString = QString("v%1 (invalid rev)").arg(_buildInfo.baseVersion);
+    }
   }
-  quasselBuildDate = __DATE__;
-  quasselBuildTime = __TIME__;
-  */
+  if(_buildInfo.fancyVersionString.isEmpty())
+    _buildInfo.fancyVersionString = _buildInfo.plainVersionString;
 }
 
 //! Signal handler for graceful shutdown.
@@ -179,10 +210,12 @@ void Quassel::handleSignal(int sig) {
       QCoreApplication::quit();
       break;
 
+#ifdef BUILD_CRASHHANDLER
     case SIGABRT:
     case SIGBUS:
     case SIGSEGV:
       handleCrash();
+#endif
       break;
     default:
       break;
@@ -190,7 +223,7 @@ void Quassel::handleSignal(int sig) {
 }
 
 void Quassel::handleCrash() {
-#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+#ifdef BUILD_CRASHHANDLER
   void* callstack[128];
   int i, frames = backtrace(callstack, 128);
 
@@ -250,38 +283,5 @@ void Quassel::handleCrash() {
   }
   dumpFile.close();
   exit(27);
-#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+#endif /* BUILD_CRASHHANDLER */
 }
-
-// FIXME temporary
-
-void Global::setupVersion() {
-
-  #  include "version.inc"
-  #  include "version.gen"
-
-  if(quasselGeneratedVersion.isEmpty()) {
-    if(quasselCommit.isEmpty())
-      quasselVersion = QString("v%1 (unknown rev)").arg(quasselBaseVersion);
-    else
-      quasselVersion = QString("v%1 (dist-%2, %3)").arg(quasselBaseVersion).arg(quasselCommit.left(7))
-      .arg(QDateTime::fromTime_t(quasselArchiveDate).toLocalTime().toString("yyyy-MM-dd"));
-  } else {
-    QStringList parts = quasselGeneratedVersion.split(':');
-    quasselVersion = QString("v%1").arg(parts[0]);
-    if(parts.count() >= 2) quasselVersion.append(QString(" (%1)").arg(parts[1]));
-  }
-  quasselBuildDate = __DATE__;
-  quasselBuildTime = __TIME__;
-}
-
-QString Global::quasselVersion;
-QString Global::quasselBaseVersion;
-QString Global::quasselGeneratedVersion;
-QString Global::quasselBuildDate;
-QString Global::quasselBuildTime;
-QString Global::quasselCommit;
-uint Global::quasselArchiveDate;
-uint Global::protocolVersion;
-uint Global::clientNeedsProtocol;
-uint Global::coreNeedsProtocol;