Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit ab082244 authored by Hartmut Riesenbeck's avatar Hartmut Riesenbeck

Replace parleys version string with KDE Applications version

Summary:
The script updated KDE Application version string now used instead of
Parleys native version string on command line, about dialog and
generator tag in kvtml files.
Implementation is done following the guideline found here:
https://community.kde.org/Guidelines_and_HOWTOs/Application_Versioning

Reviewers: #kde_edu, aacid

Reviewed By: aacid

Subscribers: kde-edu, aacid

Tags: #kde_edu

Differential Revision: https://phabricator.kde.org/D10394
parent 1a90ddeb
cmake_minimum_required(VERSION 3.0.0)
project(parley)
# KDE Application Version, managed by release script
set(KDE_APPLICATIONS_VERSION_MAJOR "18")
set(KDE_APPLICATIONS_VERSION_MINOR "03")
set(KDE_APPLICATIONS_VERSION_MICRO "70")
set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
project(parley VERSION ${KDE_APPLICATIONS_VERSION})
find_package(ECM 5.15.0 REQUIRED NO_MODULE)
......@@ -74,6 +80,9 @@ configure_file(
${CMAKE_CURRENT_BINARY_DIR}/config-parley.h
)
# let our config-parley.h be found first in any case
include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR})
# Define link libs for parley executable and unittests
......
......@@ -2,3 +2,7 @@
#cmakedefine HAVE_LIBXSLT 1
/* xrender available for fading pixmaps */
#cmakedefine HAVE_XRENDER 1
/* Parleys application version string
* It is adopted from script updated KDE Application version in top-level CMakeLists.txt */
#define PARLEY_VERSION_STRING "@parley_VERSION@"
......@@ -24,7 +24,7 @@
/// @file main.cpp
#include "parleymainwindow.h"
#include "version.h"
#include "config-parley.h"
#include <KAboutData>
#include <KCrash>
......@@ -144,4 +144,4 @@ int main(int argc, char* argv[])
parleyApp->show();
return app.exec();
}
}
}
\ No newline at end of file
......@@ -18,7 +18,6 @@
#include "../config-parley.h"
#include "parleymainwindow.h"
#include "editor/editor.h"
#include "version.h"
#include "prefs.h"
#include "vocabularyview.h"
......
#ifndef VERSION_H
#define VERSION_H
#define PARLEY_VERSION_STRING "2.1.0" // To be released with Applications/15.04
#endif
Markdown is supported
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