Description and pre/post install scripts added for rpm build

diff --git a/.gitignore b/.gitignore
index e4a293eddb30de76a3be1675797505ab12102949..d34994c1855d428ebb3326ebb6e93fc6c47a98bb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /projects/Win/vc14/.vs/
 /todo-2.1.txt
 *.log
 /projects/Win/vc14/.vs/
 /todo-2.1.txt
 *.log

+/.project

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68c1e04e2779dd0591c89d9435b7ce71afe9e2a7..ca2f58b84789d9781e005ea1ebfe58e6f5618c7d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ endif(WITH_TESTS)
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_PACKAGE_RELEASE 1)
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_PACKAGE_RELEASE 1)

-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/install/description.txt")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/build/cmake/description.txt")

 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Library of concurrent data structures")
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}")
 set(DEPLOY_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Library of concurrent data structures")
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}")
 set(DEPLOY_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}")


@@ -73,8 +73,8 @@ set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 
 # RPM specific
 set(CPACK_RPM_COMPONENT_INSTALL ON)
 
 # RPM specific
 set(CPACK_RPM_COMPONENT_INSTALL ON)

-set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/install/post_install_script.sh")
-set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/install/post_uninstall_script.sh")
+set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/build/cmake/post_install_script.sh")
+set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/build/cmake/post_uninstall_script.sh")

 #set(CPACK_RPM_CHANGELOG_FILE ${CHANGELOG_INCLUDE})
 set(CPACK_RPM_PACKAGE_LICENSE GPL)
 set(CPACK_RPM_PACKAGE_GROUP "System Environment/Base")
 #set(CPACK_RPM_CHANGELOG_FILE ${CHANGELOG_INCLUDE})
 set(CPACK_RPM_PACKAGE_LICENSE GPL)
 set(CPACK_RPM_PACKAGE_GROUP "System Environment/Base")

diff --git a/build/cmake/description.txt b/build/cmake/description.txt
new file mode 100644 (file)
index 0000000..14beb95
--- /dev/null
+++ b/build/cmake/description.txt
@@ -0,0 +1 @@
+ПК обработки измерительной информации НАП
\ No newline at end of file

diff --git a/build/cmake/post_install_script.sh b/build/cmake/post_install_script.sh
new file mode 100755 (executable)
index 0000000..0331eca
--- /dev/null
+++ b/build/cmake/post_install_script.sh
@@ -0,0 +1 @@
+/usr/sbin/ldconfig
\ No newline at end of file

diff --git a/build/cmake/post_uninstall_script.sh b/build/cmake/post_uninstall_script.sh
new file mode 100755 (executable)
index 0000000..0331eca
--- /dev/null
+++ b/build/cmake/post_uninstall_script.sh
@@ -0,0 +1 @@
+/usr/sbin/ldconfig
\ No newline at end of file

diff --git a/tests/unit/map2/CMakeLists.txt b/tests/unit/map2/CMakeLists.txt
index dc30aa0e5c6cf9885264350aad97e3c8bd385dba..4015072060dec7b90d844bd67ee324739138d005 100644 (file)
--- a/tests/unit/map2/CMakeLists.txt
+++ b/tests/unit/map2/CMakeLists.txt
@@ -26,7 +26,6 @@ set(CDSUNIT_MAP_SOURCES
     map_insfind_int_cuckoo.cpp
     map_insfind_int_ellentree.cpp
     map_insfind_int_michael.cpp
     map_insfind_int_cuckoo.cpp
     map_insfind_int_ellentree.cpp
     map_insfind_int_michael.cpp

-    map_insfind_int_multievelhashmap.cpp

     map_insfind_int_skip.cpp
     map_insfind_int_split.cpp
     map_insfind_int_striped.cpp
     map_insfind_int_skip.cpp
     map_insfind_int_split.cpp
     map_insfind_int_striped.cpp