Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
KMix
Commits
796fc33d
Commit
796fc33d
authored
Feb 13, 2021
by
Jonathan Marten
Browse files
Use release service versioning, eliminate obsolete core/version.h
parent
c506443e
Changes
6
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
796fc33d
cmake_minimum_required
(
VERSION 3.5
)
project
(
kmix
)
set
(
PROJECT_VERSION
"5.13.80"
)
set
(
PROJECT_VERSION_MAJOR 5
)
add_definitions
(
-DTRANSLATION_DOMAIN=\"kmix\"
)
# KDE Applications version, managed by release script.
set
(
RELEASE_SERVICE_VERSION_MAJOR
"21"
)
set
(
RELEASE_SERVICE_VERSION_MINOR
"03"
)
set
(
RELEASE_SERVICE_VERSION_MICRO
"70"
)
set
(
RELEASE_SERVICE_VERSION
"
${
RELEASE_SERVICE_VERSION_MAJOR
}
.
${
RELEASE_SERVICE_VERSION_MINOR
}
.
${
RELEASE_SERVICE_VERSION_MICRO
}
"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11"
)
set
(
KMIX_VERSION
${
RELEASE_SERVICE_VERSION
}
)
project
(
kmix VERSION
${
KMIX_VERSION
}
)
# SOVERSION of the kmixcore library
set
(
KMIX_VERSION_MAJOR 5
)
# Version of the configuration, originally from core/version.h
set
(
KMIX_CONFIG_VERSION 3
)
set
(
QT_MIN_VERSION
"5.11.0"
)
set
(
KF5_MIN_VERSION
"5.48.0"
)
...
...
@@ -86,6 +92,13 @@ if (MSVC)
include_directories
(
${
TAGLIB_INCLUDES
}
)
endif
(
MSVC
)
# TODO: this must be long obsolete by now
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11"
)
add_definitions
(
-DTRANSLATION_DOMAIN=\"kmix\"
)
add_definitions
(
-DKMIX_VERSION=\"
${
KMIX_VERSION
}
\"
)
add_definitions
(
-DKMIX_CONFIG_VERSION=
${
KMIX_CONFIG_VERSION
}
)
if
(
ALSA_FOUND
)
set
(
HAVE_LIBASOUND2 TRUE
)
add_definitions
(
-DHAVE_LIBASOUND2
)
...
...
@@ -199,7 +212,7 @@ target_link_libraries(kmixcore
KF5::ConfigGui
)
set_target_properties
(
kmixcore PROPERTIES VERSION
${
PROJECT
_VERSION
}
SOVERSION
${
PROJECT
_VERSION_MAJOR
}
)
set_target_properties
(
kmixcore PROPERTIES VERSION
${
KMIX
_VERSION
}
SOVERSION
${
KMIX
_VERSION_MAJOR
}
)
generate_export_header
(
kmixcore BASE_NAME kmixcore EXPORT_FILE_NAME kmixcore_export.h
)
if
(
HAVE_LIBASOUND2
)
...
...
apps/kmix.cpp
View file @
796fc33d
...
...
@@ -56,7 +56,6 @@
#include "gui/kmixprefdlg.h"
#include "gui/kmixdockwidget.h"
#include "gui/kmixtoolbox.h"
#include "core/version.h"
#include "gui/viewdockareapopup.h"
#include "gui/dialogaddview.h"
#include "gui/dialogselectmaster.h"
...
...
apps/kmixctrl.cpp
View file @
796fc33d
...
...
@@ -30,7 +30,6 @@
#include "gui/kmixtoolbox.h"
#include "core/GlobalConfig.h"
#include "core/mixer.h"
#include "core/version.h"
static
const
char
description
[]
=
I18N_NOOP
(
"kmixctrl - kmix volume save/restore utility"
);
...
...
@@ -42,7 +41,7 @@ int main(int argc, char *argv[])
KLocalizedString
::
setApplicationDomain
(
"kmix"
);
KAboutData
aboutData
(
"kmixctrl"
,
i18n
(
"KMixCtrl"
),
APP
_VERSION
,
i18n
(
description
),
KMIX
_VERSION
,
i18n
(
description
),
KAboutLicense
::
GPL
,
i18n
(
"(c) 2000 by Stefan Schimanski"
));
...
...
apps/kmixd.cpp
View file @
796fc33d
...
...
@@ -32,33 +32,11 @@
#include "core/mixertoolbox.h"
#include "core/kmixdevicemanager.h"
#include "core/mixer.h"
#include "core/version.h"
K_PLUGIN_FACTORY_WITH_JSON
(
KMixDFactory
,
"kmixd.json"
,
registerPlugin
<
KMixD
>
();)
/*
static const char description[] =
I18N_NOOP("KMixD - KDE's full featured mini mixer Service");
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "kmixd", 0, ki18n("KMixD"),
APP_VERSION, ki18n(description), KAboutData::License_GPL,
ki18n("(c) 2010 Christian Esken"));
KCmdLineArgs::init( argc, argv, &aboutData );
// As in the KUniqueApplication example only create a instance AFTER
// calling KUniqueApplication::start()
KUniqueApplication app;
KMixD kmixd;
app.exec();
}
*/
/* KMixD
* Constructs a mixer window (KMix main window)
*/
...
...
apps/main.cpp
View file @
796fc33d
...
...
@@ -27,7 +27,6 @@
#include <kdbusservice.h>
#include "KMixApp.h"
#include "core/version.h"
#include "kmix_debug.h"
static
const
char
description
[]
=
...
...
@@ -42,7 +41,7 @@ int main(int argc, char *argv[])
KLocalizedString
::
setApplicationDomain
(
"kmix"
);
KAboutData
aboutData
(
"kmix"
,
i18n
(
"KMix"
),
APP
_VERSION
,
i18n
(
description
),
KAboutLicense
::
GPL
,
KMIX
_VERSION
,
i18n
(
description
),
KAboutLicense
::
GPL
,
i18n
(
"(c) 1996-2013 The KMix Authors"
));
// Author Policy: Long-term maintainers and backend writers/maintainers go in the Authors list.
...
...
core/version.h
deleted
100644 → 0
View file @
c506443e
//-*-C++-*-
/*
* KMix -- KDE's full featured mini mixer
*
* Copyright Christian Esken <esken@kde.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef APP_VERSION
#define APP_VERSION "4.6"
#define KMIX_CONFIG_VERSION 3
#endif // APP_VERSION
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment