changed generation of git-revision.h which allows to keep it up-to-date. Aditionally git-branch info has been added.

This commit is contained in:
2017-02-22 09:42:07 +01:00
parent cc1679144c
commit fca13283e1
16 changed files with 73 additions and 28 deletions

View File

@@ -38,7 +38,8 @@ PMusrEditAbout::PMusrEditAbout(QWidget *parent, Qt::WindowFlags f) : QDialog(par
{
setupUi(this);
fGitRev_label->setText(QString("git: %1").arg(GIT_REVISION));
fGitBranch_label->setText(QString("git-branch: %1").arg(GIT_BRANCH));
fGitRev_label->setText(QString("git-rev: %1").arg(GIT_CURRENT_SHA1));
setModal(true);
}

View File

@@ -72,7 +72,6 @@ using namespace std;
#include "PDumpOutputHandler.h"
#include "PPrefsDialog.h"
#include "PGetMusrFTOptionsDialog.h"
//#include "PGetDefaultDialog.h"
#include "PMusrEditAbout.h"
#include "PMsr2DataDialog.h"

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>395</width>
<height>187</height>
<height>202</height>
</rect>
</property>
<property name="windowTitle">
@@ -20,10 +20,10 @@
<widget class="QWidget" name="">
<property name="geometry">
<rect>
<x>12</x>
<y>12</y>
<x>13</x>
<y>13</y>
<width>371</width>
<height>161</height>
<height>181</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -46,6 +46,23 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="fGitBranch_label">
<property name="font">
<font>
<weight>75</weight>
<italic>true</italic>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;git-branch: &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="fGitRev_label">
<property name="font">
@@ -56,7 +73,7 @@ p, li { white-space: pre-wrap; }
</font>
</property>
<property name="text">
<string>git:</string>
<string>git-rev:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>

View File

@@ -53,7 +53,7 @@ int main( int argc, char ** argv )
cout << endl << endl;
return 0;
} else if (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-v")) {
cout << endl << "musredit git-rev: " << GIT_REVISION;
cout << endl << "musredit git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1;
cout << endl << endl;
return 0;
}