Commit 48881b91 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Set and make use of RELEASE_SERVICE_VERSION variables

GIT_SILENT
parent adb33847
cmake_minimum_required(VERSION 3.0)
project(kompare)
# Release Service version, managed by release script
set (RELEASE_SERVICE_VERSION_MAJOR "20")
set (RELEASE_SERVICE_VERSION_MINOR "11")
set (RELEASE_SERVICE_VERSION_MICRO "80")
set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}")
# Bump KOMPARE_BASE_VERSION once new features are added
set(KOMPARE_BASE_VERSION "4.1")
set(KOMPARE_VERSION "${KOMPARE_BASE_VERSION}.${RELEASE_SERVICE_COMPACT_VERSION}")
project(Kompare VERSION ${KOMPARE_VERSION})
set(QT_MIN_VERSION "5.12.0")
set(KF_MIN_VERSION "5.68.0")
......@@ -16,6 +26,7 @@ include(ECMInstallIcons)
include(GenerateExportHeader)
include(ECMAddAppIcon)
include(ECMQtDeclareLoggingCategory)
include(ECMSetupVersion)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
Core
......@@ -61,6 +72,11 @@ add_definitions(
-DKF_DEPRECATED_WARNINGS_SINCE=0x060000
)
ecm_setup_version(${Kompare_VERSION}
VARIABLE_PREFIX KOMPARE
VERSION_HEADER kompare_version.h
)
add_subdirectory( doc )
add_subdirectory( interfaces )
add_subdirectory( libdialogpages )
......
......@@ -31,6 +31,7 @@
#include <libkomparediff2/komparemodellist.h>
#include <komparenavviewdebug.h>
#include "../kompare_version.h"
#define COL_SOURCE 0
#define COL_DESTINATION 1
......@@ -38,6 +39,19 @@
using namespace Diff2;
static KAboutData aboutData()
{
KAboutData about(
QStringLiteral("komparenavtreepart"),
i18n("KompareNavTreePart"),
QStringLiteral(KOMPARE_VERSION_STRING)
);
about.addAuthor(i18n("John Firebaugh"), i18n("Author"), QStringLiteral("jfirebaugh@kde.org"));
about.addAuthor(i18n("Otto Bruggeman"), i18n("Author"), QStringLiteral("bruggie@gmail.com"));
return about;
}
KompareNavTreePart::KompareNavTreePart(QWidget* parentWidget, QObject* parent, const QVariantList&)
: KParts::ReadOnlyPart(parent),
m_splitter(nullptr),
......@@ -54,6 +68,8 @@ KompareNavTreePart::KompareNavTreePart(QWidget* parentWidget, QObject* parent, c
m_destination(),
m_info(nullptr)
{
setComponentData(aboutData());
m_splitter = new QSplitter(Qt::Horizontal, parentWidget);
setWidget(m_splitter);
......@@ -771,14 +787,6 @@ KDirLVI::~KDirLVI()
m_modelList.clear();
}
static KAboutData aboutData()
{
KAboutData about(QStringLiteral("komparenavtreepart"), i18n("KompareNavTreePart"), QStringLiteral("1.2"));
about.addAuthor(i18n("John Firebaugh"), i18n("Author"), QStringLiteral("jfirebaugh@kde.org"));
about.addAuthor(i18n("Otto Bruggeman"), i18n("Author"), QStringLiteral("bruggie@gmail.com"));
return about;
}
K_PLUGIN_FACTORY_WITH_JSON(KompareNavTreePartFactory, "komparenavtreepart.json",
registerPlugin<KompareNavTreePart>();)
......
......@@ -17,6 +17,7 @@
#include "kompare_partfactory.h"
#include "kompare_part.h"
#include "../kompare_version.h"
// KF
#include <KLocalizedString>
......@@ -24,7 +25,7 @@
KomparePartFactory::KomparePartFactory()
: m_aboutData(QStringLiteral("komparepart"),
i18n("KomparePart"),
QStringLiteral("4.0"),
QStringLiteral(KOMPARE_VERSION_STRING),
QString(),
KAboutLicense::GPL
)
......
......@@ -37,6 +37,7 @@
#include "kompareinterface.h"
#include "kompare_version.h"
#include "kompare_shell.h"
#include "kompareurldialog.h"
......@@ -52,7 +53,8 @@ int main(int argc, char* argv[])
QApplication app(argc, argv);
KLocalizedString::setApplicationDomain("kompare");
KAboutData aboutData(QStringLiteral("kompare"), i18n("Kompare"), QStringLiteral("4.1.3"),
KAboutData aboutData(QStringLiteral("kompare"), i18n("Kompare"),
QStringLiteral(KOMPARE_VERSION_STRING),
i18n("A program to view the differences between files and optionally generate a diff"),
KAboutLicense::GPL,
i18n("(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) 2004-2005 Jeff Snyder, (c) 2007-2012 Kevin Kofler"));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment