improved build scripts

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@356 90c681e8-e032-0410-971d-27865f9a5e38

12 files changed, 66 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab4b2f91..b0c124803 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,7 @@
+SET(QMMP_VERSION 0.2.0)
+SET(QMMP_SOVERSION 0)
+SET(SVN_VERSION TRUE)
+
 SET(LIB_DIR "lib" CACHE STRING "library path")
 add_subdirectory(src/qmmp)
 add_subdirectory(src/qmmpui)
diff --git a/qmmp.pri b/qmmp.pri
index 6e7c57780..f112d8c9b 100644
--- a/qmmp.pri
+++ b/qmmp.pri
@@ -5,6 +5,10 @@ UI_DIR=./.build/ui/
 MOC_DIR=./.build/moc/
 OBJECTS_DIR=./.build/obj
 
+#Version
+
+QMMP_VERSION = 0.2.0
+CONFIG += SVN_VERSION
 
 
 #Comment/uncomment this if you want to change plugins list
diff --git a/remove_svn_tags b/remove_svn_tags
index 272f26a2b..7df48c276 100644
--- a/remove_svn_tags
+++ b/remove_svn_tags
@@ -4,6 +4,9 @@
 # Removes svn tags from qmmp package #
 ######################################
 
+make distclean
+rm -rf lib
+
 rm_dir='.build'
 
 walk_dirs(){
diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt
index fe7cd30da..ce32bc4ca 100644
--- a/src/qmmp/CMakeLists.txt
+++ b/src/qmmp/CMakeLists.txt
@@ -13,6 +13,12 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 ADD_DEFINITIONS(-DQT_THREAD)
 ADD_DEFINITIONS(-DLIB_DIR=\\\"\\/${LIB_DIR}\\\")
+ADD_DEFINITIONS(-DQMMP_VERSION=${QMMP_VERSION})
+IF(SVN_VERSION)
+ADD_DEFINITIONS(-DQMMP_STR_VERSION=\\\"${QMMP_VERSION}-svn\\\")
+ELSE(SVN_VERSION)
+ADD_DEFINITIONS(-DQMMP_STR_VERSION=\\\"${QMMP_VERSION}\\\")
+ENDIF(SVN_VERSION)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
@@ -57,4 +63,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(qmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS})
 target_link_libraries(qmmp ${QT_LIBRARIES} curl)
+SET_TARGET_PROPERTIES(qmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION})
 install(TARGETS qmmp LIBRARY DESTINATION ${LIB_DIR})
diff --git a/src/qmmp/constants.h b/src/qmmp/constants.h
index caf9f91b8..ed99fb28e 100644
--- a/src/qmmp/constants.h
+++ b/src/qmmp/constants.h
@@ -1,7 +1,13 @@
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
 
-#define VERSION "0.2.0"
+#ifndef QMMP_STR_VERSION
+#define QMMP_STR_VERSION "0.2.0"
+#endif
+
+#ifndef QMMP_VERSION
+#define QMMP_VERSION 0.2.0
+#endif
 
 #ifndef LIB_DIR
 #define LIB_DIR "/lib"
diff --git a/src/qmmp/downloader.cpp b/src/qmmp/downloader.cpp
index f51e0c509..fe380638a 100644
--- a/src/qmmp/downloader.cpp
+++ b/src/qmmp/downloader.cpp
@@ -24,6 +24,7 @@
 #include <QDir>
 #include <stdint.h>
 
+#include "constants.h"
 #include "downloader.h"
 
 //curl callbacks
@@ -240,7 +241,7 @@ void Downloader::run()
     curl_easy_setopt(m_handle, CURLOPT_FAILONERROR, 1);
     curl_easy_setopt(m_handle, CURLOPT_MAXREDIRS, 15);
     // user agent
-    curl_easy_setopt(m_handle, CURLOPT_USERAGENT, "qmmp/0.2");
+    curl_easy_setopt(m_handle, CURLOPT_USERAGENT, "qmmp/"QMMP_STR_VERSION);
     curl_easy_setopt(m_handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 
     struct curl_slist *http200_aliases = curl_slist_append(NULL, "ICY");
diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro
index 6c2bc3aa0..a7cedbf31 100644
--- a/src/qmmp/qmmp.pro
+++ b/src/qmmp/qmmp.pro
@@ -39,6 +39,7 @@ thread \
 link_pkgconfig
 
 TEMPLATE = lib
+VERSION = $$QMMP_VERSION
 PKGCONFIG += libcurl
 
 unix:isEmpty(LIB_DIR){
@@ -46,6 +47,12 @@ unix:isEmpty(LIB_DIR){
 }
 
 unix:DEFINES += LIB_DIR=\\\"$$LIB_DIR\\\"
+DEFINES += QMMP_VERSION=$$QMMP_VERSION
+contains(CONFIG, SVN_VERSION) {
+DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION-svn\\\"
+} else {
+DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION\\\"
+}
 
 target.path = $$LIB_DIR
 INSTALLS += target
diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt
index 613b67c5f..1c4b07f2a 100644
--- a/src/qmmpui/CMakeLists.txt
+++ b/src/qmmpui/CMakeLists.txt
@@ -13,6 +13,11 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 ADD_DEFINITIONS(-DQT_THREAD)
 ADD_DEFINITIONS(-DLIB_DIR=\\\"\\/${LIB_DIR}\\\")
+IF(SVN_VERSION)
+ADD_DEFINITIONS(-DQMMP_STR_VERSION=\\\"${QMMP_VERSION}-svn\\\")
+ELSE(SVN_VERSION)
+ADD_DEFINITIONS(-DQMMP_STR_VERSION=\\\"${QMMP_VERSION}\\\")
+ENDIF(SVN_VERSION)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
@@ -37,6 +42,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(qmmpui SHARED ${libqmmpui_SRCS} ${libqmmpui_MOC_SRCS})
 target_link_libraries(qmmpui ${QT_LIBRARIES})
-
+SET_TARGET_PROPERTIES(qmmpui PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION})
 install(TARGETS qmmpui LIBRARY DESTINATION ${LIB_DIR})
 
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index db64c7198..8ed295534 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -7,7 +7,7 @@ qt \
 thread
 
 TEMPLATE = lib
-
+VERSION = $$QMMP_VERSION
 
 unix:isEmpty(LIB_DIR){
     LIB_DIR = /lib
@@ -15,6 +15,12 @@ unix:isEmpty(LIB_DIR){
 
 unix:DEFINES += LIB_DIR=\\\"$$LIB_DIR\\\"
 
+DEFINES += QMMP_VERSION=$$QMMP_VERSION
+contains(CONFIG, SVN_VERSION) {
+DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION-svn\\\"
+} else {
+DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION\\\"
+}
 
 target.path = $$LIB_DIR
 INSTALLS += target
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index b0214d22d..d806f1fe2 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -14,6 +14,12 @@ include(${QT_USE_FILE})
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_THREAD)
+ADD_DEFINITIONS(-DQMMP_VERSION=${QMMP_VERSION})
+IF(SVN_VERSION)
+ADD_DEFINITIONS(-DQMMP_STR_VERSION=\\\"${QMMP_VERSION}-svn\\\")
+ELSE(SVN_VERSION)
+ADD_DEFINITIONS(-DQMMP_STR_VERSION=\\\"${QMMP_VERSION}\\\")
+ENDIF(SVN_VERSION)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
diff --git a/src/ui/ui.pro b/src/ui/ui.pro
index 9b236c539..e9c1db1fa 100644
--- a/src/ui/ui.pro
+++ b/src/ui/ui.pro
@@ -137,6 +137,13 @@ RESOURCES = images/images.qrc \
 TEMPLATE = app
 target.path = /bin
 
+DEFINES += QMMP_VERSION=$$QMMP_VERSION
+contains(CONFIG, SVN_VERSION) {
+DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION-svn\\\"
+} else {
+DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION\\\"
+}
+
 desktop.files = qmmp.desktop
 desktop.path = /share/applications
 
diff --git a/src/ui/version.h b/src/ui/version.h
index 61fbc902e..8bd09040b 100644
--- a/src/ui/version.h
+++ b/src/ui/version.h
@@ -1,9 +1,13 @@
 #ifndef _QMMP_VERSION_H
 #define _QMMP_VERSION_H
 
-#define QMMP_VERSION 0.1.4
+#ifndef QMMP_VERSION
+#define QMMP_VERSION 0.2.0
+#endif
 
-#define QMMP_STR_VERSION "0.1.4"
+#ifndef QMMP_STR_VERSION
+#define QMMP_STR_VERSION "0.2.0"
+#endif
 
 #define LISTEN_PORT_BASE 33000
 #define UDS_PATH "/tmp/qmmp.sock"