diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/qmmp/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/qmmp/qmmp.cpp | 16 | ||||
| -rw-r--r-- | src/qmmp/qmmp.h | 5 |
4 files changed, 20 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 897e462c7..cdbf93fce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SVN_VERSION TRUE) #extract version from qmmp.h FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") - + IF(QMMP_VERSION_DATA) FOREACH(item IN ITEMS MAJOR MINOR PATCH) STRING(REGEX REPLACE ".*#define[ \t]+QMMP_VERSION_${item}[ \t]+([0-9]+).*" @@ -13,11 +13,11 @@ IF(QMMP_VERSION_DATA) ENDFOREACH(item IN ITEMS MAJOR MINOR PATCH) SET(QMMP_VERSION "${QMMP_VERSION_MAJOR}.${QMMP_VERSION_MINOR}.${QMMP_VERSION_PATCH}") SET(QMMP_SOVERSION "${QMMP_VERSION_MAJOR}") - IF(SVN_VERSION) - MESSAGE(STATUS "Qmmp API version: ${QMMP_VERSION} (development)") - ELSE(SVN_VERSION) + IF(QMMP_VERSION_STABLE) MESSAGE(STATUS "Qmmp API version: ${QMMP_VERSION} (stable)") - ENDIF(SVN_VERSION) + ELSE(QMMP_VERSION_STABLE) + MESSAGE(STATUS "Qmmp API version: ${QMMP_VERSION} (development)") + ENDIF(QMMP_VERSION_STABLE) ELSE(QMMP_VERSION_DATA) MESSAGE(FATAL_ERROR "invalid header") ENDIF(QMMP_VERSION_DATA) @@ -36,7 +36,7 @@ INCLUDE(${QT_USE_FILE}) INCLUDE(FindPkgConfig) IF(NOT QT_LRELEASE_EXECUTABLE) -FIND_PROGRAM(QT_LRELEASE_EXECUTABLE +FIND_PROGRAM(QT_LRELEASE_EXECUTABLE NAMES lrelease PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index ffad434ed..4e4c1218c 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -16,15 +16,13 @@ ADD_DEFINITIONS(-DQT_THREAD) ADD_DEFINITIONS(-DLIB_DIR=\\\"\\/${LIB_DIR}\\\") ADD_DEFINITIONS(-DQMMP_INSTALL_PREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\") -IF(SVN_VERSION) #add svn revision +IF(NOT QMMP_VERSION_STABLE) #add svn revision execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/svn_revision.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE SVN_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) ADD_DEFINITIONS(-DSVN_REVISION=\\\"${SVN_REVISION}\\\") -ELSE(SVN_VERSION) - -ENDIF(SVN_VERSION) +ENDIF(NOT QMMP_VERSION_STABLE) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -95,7 +93,7 @@ SET(libqmmp_MOC_HDRS inputsource.h fileinputsource_p.h emptyinputsource_p.h - qmmpsettings.h + qmmpsettings.h ) SET(libqmmp_DEVEL_HDRS diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index d73e5e9db..091729074 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -24,10 +24,6 @@ #include <QLocale> #include <QByteArray> -#ifndef QMMP_STR_VERSION -#define QMMP_STR_VERSION "0.6.0" -#endif - #ifndef LIB_DIR #define LIB_DIR "/lib" #endif @@ -48,12 +44,18 @@ void Qmmp::setConfigFile(const QString &path) const QString Qmmp::strVersion() { + QString ver = QString("%1.%2.%3") + .arg(QMMP_VERSION_MAJOR) + .arg(QMMP_VERSION_MINOR) + .arg(QMMP_VERSION_PATCH); +#if !QMMP_VERSION_STABLE && SVN_REVISION #ifdef SVN_REVISION - return QString("%1.%2.%3-%4").arg(QMMP_VERSION_MAJOR).arg(QMMP_VERSION_MINOR).arg(QMMP_VERSION_PATCH) - .arg(SVN_REVISION); + ver += "-"SVN_REVISION; #else - return QString("%1.%2.%3").arg(QMMP_VERSION_MAJOR).arg(QMMP_VERSION_MINOR).arg(QMMP_VERSION_PATCH); + ver += "-svn"; +#endif #endif + return ver; } const QString Qmmp::pluginsPath() diff --git a/src/qmmp/qmmp.h b/src/qmmp/qmmp.h index a9675fb46..fe368df17 100644 --- a/src/qmmp/qmmp.h +++ b/src/qmmp/qmmp.h @@ -20,13 +20,12 @@ #ifndef QMMP_H #define QMMP_H -#include <QUrl> -#include <QEvent> - +#include <QString> #define QMMP_VERSION_MAJOR 0 #define QMMP_VERSION_MINOR 6 #define QMMP_VERSION_PATCH 0 +#define QMMP_VERSION_STABLE 0 #define QMMP_VERSION_INT (QMMP_VERSION_MAJOR<<16 | QMMP_VERSION_MINOR<<8 | QMMP_VERSION_PATCH) |