X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fgenversion.cpp;h=69dfb5422f5b441120075b7aa5803341191ce13e;hp=f0f746bb05885c09d5bc7b00e9917ce9e29f98ab;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d

diff --git a/src/common/genversion.cpp b/src/common/genversion.cpp
index f0f746bb..69dfb542 100644
--- a/src/common/genversion.cpp
+++ b/src/common/genversion.cpp
@@ -29,107 +29,108 @@
 #include <QRegExp>
 #include <QFile>
 
-int main(int argc, char **argv) {
-  if(argc < 3) {
-    qFatal("Usage: ./genversion <git_root> <target_file>");
-    return 255;
-  }
-  QString gitroot = argv[1];
-  QString target = argv[2];
-  QString basever, protover, clientneeds, coreneeds, descrver, dirty;
-  QString committish, commitdate;
+int main(int argc, char **argv)
+{
+    if (argc < 3) {
+        qFatal("Usage: ./genversion <git_root> <target_file>");
+        return 255;
+    }
+    QString gitroot = argv[1];
+    QString target = argv[2];
+    QString basever, protover, clientneeds, coreneeds, descrver, dirty;
+    QString committish, commitdate;
 
-  // check Git for information if present
-  if(QFile::exists(gitroot + "/.git")) {
-    // try to execute git-describe to get a version string
-    QProcess git;
-    git.setWorkingDirectory(gitroot);
+    // check Git for information if present
+    if (QFile::exists(gitroot + "/.git")) {
+        // try to execute git-describe to get a version string
+        QProcess git;
+        git.setWorkingDirectory(gitroot);
     #ifdef Q_OS_WIN
-    git.start("cmd.exe", QStringList() << "/C" << "git" << "describe" << "--long");
+        git.start("cmd.exe", QStringList() << "/C" << "git" << "describe" << "--long");
     #else
-    git.start("git", QStringList() << "describe" << "--long");
+        git.start("git", QStringList() << "describe" << "--long");
     #endif
-    if(git.waitForFinished(10000)) {
-      QString descr = git.readAllStandardOutput().trimmed();
-      if(!descr.isEmpty() && !descr.contains("fatal")) {
-        // seems we have a valid git describe string
-        descrver = descr;
-        // check if the workdir is dirty
+        if (git.waitForFinished(10000)) {
+            QString descr = git.readAllStandardOutput().trimmed();
+            if (!descr.isEmpty() && !descr.contains("fatal")) {
+                // seems we have a valid git describe string
+                descrver = descr;
+                // check if the workdir is dirty
         #ifdef Q_OS_WIN
-        git.start("cmd.exe", QStringList() << "/C" << "git" << "diff-index" << "--name-only" << "HEAD");
+                git.start("cmd.exe", QStringList() << "/C" << "git" << "diff-index" << "--name-only" << "HEAD");
         #else
-        git.start("git", QStringList() << "diff-index" << "--name-only" << "HEAD");
+                git.start("git", QStringList() << "diff-index" << "--name-only" << "HEAD");
         #endif
-        if(git.waitForFinished(10000)) {
-          if(!git.readAllStandardOutput().isEmpty()) dirty = "*";
-        }
-        // get a full committish
+                if (git.waitForFinished(10000)) {
+                    if (!git.readAllStandardOutput().isEmpty()) dirty = "*";
+                }
+                // get a full committish
         #ifdef Q_OS_WIN
-        git.start("cmd.exe", QStringList() << "/C" << "git" << "rev-parse" << "HEAD");
+                git.start("cmd.exe", QStringList() << "/C" << "git" << "rev-parse" << "HEAD");
         #else
-        git.start("git", QStringList() << "rev-parse" << "HEAD");
+                git.start("git", QStringList() << "rev-parse" << "HEAD");
         #endif
-        if(git.waitForFinished(10000)) {
-          committish = git.readAllStandardOutput().trimmed();
+                if (git.waitForFinished(10000)) {
+                    committish = git.readAllStandardOutput().trimmed();
+                }
+                // Now we do some replacement magic...
+                //QRegExp rxCheckTag("(.*)-0-g[0-9a-f]+\n$");
+                //QRegExp rxGittify("(.*)-(\\d+)-g([0-9a-f]+)\n$");
+                //gitversion.replace(rxCheckTag, QString("\\1%1").arg(dirty));
+                //gitversion.replace(rxGittify, QString("\\1:git-\\3+\\2%1").arg(dirty));
+            }
         }
-        // Now we do some replacement magic...
-        //QRegExp rxCheckTag("(.*)-0-g[0-9a-f]+\n$");
-        //QRegExp rxGittify("(.*)-(\\d+)-g([0-9a-f]+)\n$");
-        //gitversion.replace(rxCheckTag, QString("\\1%1").arg(dirty));
-        //gitversion.replace(rxGittify, QString("\\1:git-\\3+\\2%1").arg(dirty));
-      }
     }
-  }
 
-  // parse version.inc
-  QFile verfile(gitroot + "/version.inc");
-  if(verfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    QString ver = verfile.readAll();
+    // parse version.inc
+    QFile verfile(gitroot + "/version.inc");
+    if (verfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QString ver = verfile.readAll();
 
-    QRegExp rxBasever("baseVersion\\s*=\\s*\"(.*)\";");
-    if(rxBasever.indexIn(ver) >= 0)
-      basever = rxBasever.cap(1);
+        QRegExp rxBasever("baseVersion\\s*=\\s*\"(.*)\";");
+        if (rxBasever.indexIn(ver) >= 0)
+            basever = rxBasever.cap(1);
 
-    QRegExp rxProtover("protocolVersion\\s*=\\s*(\\d+)");
-    if(rxProtover.indexIn(ver) >= 0)
-      protover = rxProtover.cap(1);
+        QRegExp rxProtover("protocolVersion\\s*=\\s*(\\d+)");
+        if (rxProtover.indexIn(ver) >= 0)
+            protover = rxProtover.cap(1);
 
-    QRegExp rxClientneeds("clientNeedsProtocol\\s*=\\s*(\\d+)");
-    if(rxClientneeds.indexIn(ver) >= 0)
-      clientneeds = rxClientneeds.cap(1);
+        QRegExp rxClientneeds("clientNeedsProtocol\\s*=\\s*(\\d+)");
+        if (rxClientneeds.indexIn(ver) >= 0)
+            clientneeds = rxClientneeds.cap(1);
 
-    QRegExp rxCoreneeds("coreNeedsProtocol\\s*=\\s*(\\d+)");
-    if(rxCoreneeds.indexIn(ver) >= 0)
-      coreneeds = rxCoreneeds.cap(1);
+        QRegExp rxCoreneeds("coreNeedsProtocol\\s*=\\s*(\\d+)");
+        if (rxCoreneeds.indexIn(ver) >= 0)
+            coreneeds = rxCoreneeds.cap(1);
 
-    if(committish.isEmpty()) {
-      QRegExp rxCommit("distCommittish\\s*=\\s*([0-9a-f]+)");
-      if(rxCommit.indexIn(ver) >= 0) committish = rxCommit.cap(1);
-    }
+        if (committish.isEmpty()) {
+            QRegExp rxCommit("distCommittish\\s*=\\s*([0-9a-f]+)");
+            if (rxCommit.indexIn(ver) >= 0) committish = rxCommit.cap(1);
+        }
 
-    QRegExp rxTimestamp("distCommitDate\\s*=\\s*([0-9]+)");
-    if(rxTimestamp.indexIn(ver) >= 0) commitdate = rxTimestamp.cap(1);
-    verfile.close();
-  }
+        QRegExp rxTimestamp("distCommitDate\\s*=\\s*([0-9]+)");
+        if (rxTimestamp.indexIn(ver) >= 0) commitdate = rxTimestamp.cap(1);
+        verfile.close();
+    }
 
-  // generate the contents for version.gen
-  QByteArray contents = QString("QString buildinfo = \"%1,%2,%3,%4,%5,%6,%7,%8\";\n")
-                                .arg(basever, descrver, dirty, committish, commitdate, protover, clientneeds, coreneeds)
-                                .toAscii();
+    // generate the contents for version.gen
+    QByteArray contents = QString("QString buildinfo = \"%1,%2,%3,%4,%5,%6,%7,%8\";\n")
+                          .arg(basever, descrver, dirty, committish, commitdate, protover, clientneeds, coreneeds)
+                          .toAscii();
 
-  QFile gen(target);
-  if(!gen.open(QIODevice::ReadWrite | QIODevice::Text)) {
-    qFatal("%s", qPrintable(QString("Could not write %1!").arg(target)));
-    return EXIT_FAILURE;
-  }
-  QByteArray oldContents = gen.readAll();
-  if(oldContents != contents) { // only touch the file if something changed
-    gen.seek(0);
-    gen.resize(0);
-    gen.write(contents);
-    gen.waitForBytesWritten(10000);
-  }
-  gen.close();
+    QFile gen(target);
+    if (!gen.open(QIODevice::ReadWrite | QIODevice::Text)) {
+        qFatal("%s", qPrintable(QString("Could not write %1!").arg(target)));
+        return EXIT_FAILURE;
+    }
+    QByteArray oldContents = gen.readAll();
+    if (oldContents != contents) { // only touch the file if something changed
+        gen.seek(0);
+        gen.resize(0);
+        gen.write(contents);
+        gen.waitForBytesWritten(10000);
+    }
+    gen.close();
 
-  return EXIT_SUCCESS;
+    return EXIT_SUCCESS;
 }