diff options
| author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-10-18 13:40:57 +0200 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-10-18 13:40:57 +0200 |
| commit | 8e7817ca22559f477b7624b8885dd06c32144e4e (patch) | |
| tree | e874b693c7a137bd461f9d50923b52764f7801d1 | |
| parent | c14ff33f94913a5ad5a58b46facfa95705b7cfc4 (diff) | |
| download | DLT-daemon-8e7817ca22559f477b7624b8885dd06c32144e4e.tar.gz | |
Prepared new version number and new config files installation.
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | include/dlt/dlt_version.h | 6 | ||||
| -rwxr-xr-x | src/daemon/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/daemon/dlt.conf (renamed from testscripts/dlt.conf) | 0 | ||||
| -rwxr-xr-x | src/lib/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | src/system/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | testscripts/CMakeLists.txt | 1 |
7 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38f8a67..7e85528 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ PROJECT( automotive-dlt ) # Set version parameters
SET( ${PROJECT_NAME}_MAJOR_VERSION 2 )
-SET( ${PROJECT_NAME}_MINOR_VERSION 3 )
+SET( ${PROJECT_NAME}_MINOR_VERSION 4 )
SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )
SET( ${PROJECT_NAME}_VERSION_STATE )
SET( GENIVI_PROJECT_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL})
diff --git a/include/dlt/dlt_version.h b/include/dlt/dlt_version.h index 0ccd020..7a84231 100755 --- a/include/dlt/dlt_version.h +++ b/include/dlt/dlt_version.h @@ -3,10 +3,10 @@ #define __VERSION_H_ #define PACKAGE_VERSION_STATE "" -#define PACKAGE_VERSION "2.3.0" +#define PACKAGE_VERSION "2.4.0" #define PACKAGE_MAJOR_VERSION "2" -#define PACKAGE_MINOR_VERSION "3" +#define PACKAGE_MINOR_VERSION "4" #define PACKAGE_PATCH_LEVEL "0" -#define PACKAGE_REVISION "v2.3.0-35-ga0e2ed4" +#define PACKAGE_REVISION "" #endif diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index c309a91..45bfbbf 100755 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -49,3 +49,6 @@ install(TARGETS dlt-daemon WORLD_EXECUTE WORLD_READ COMPONENT base) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf + DESTINATION "etc" + COMPONENT base) diff --git a/testscripts/dlt.conf b/src/daemon/dlt.conf index 629794d..629794d 100644 --- a/testscripts/dlt.conf +++ b/src/daemon/dlt.conf diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 7956e1f..3a6185e 100755 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -45,7 +45,7 @@ ENDIF(GPROF_DLT_LIB) target_link_libraries(dlt rt ${CMAKE_THREAD_LIBS_INIT}) -set_target_properties(dlt PROPERTIES VERSION 2.3.0 SOVERSION 2) +set_target_properties(dlt PROPERTIES VERSION 2.4.0 SOVERSION 2) install(TARGETS dlt LIBRARY DESTINATION lib diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 4c3e3c2..64f44f1 100755 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -47,4 +47,6 @@ install(TARGETS dlt-system RUNTIME DESTINATION bin COMPONENT base) - +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-system.conf + DESTINATION "etc" + COMPONENT base) diff --git a/testscripts/CMakeLists.txt b/testscripts/CMakeLists.txt index d81b036..3a86293 100755 --- a/testscripts/CMakeLists.txt +++ b/testscripts/CMakeLists.txt @@ -34,3 +34,4 @@ # # @licence end@ ######## + |