* 临时提交,支持是否发送根证书的开关

This commit is contained in:
fengweihao
2019-11-11 17:45:03 +08:00
parent 88ec8b2b24
commit 900b73f875
5 changed files with 94 additions and 95 deletions

View File

@@ -4,13 +4,11 @@ else()
set(CPACK_PACKAGE_NAME "certostre")
endif()
message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
set(CPACK_PACKAGE_VENDOR "MESASOFT")
set(CPACK_PACKAGE_VERSION_MAJOR "${TARGET_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${TARGET_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${TARGET_PATCH}.${TARGET_DESCRIBE}")
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
# RPM Build
set(CPACK_GENERATOR "RPM")
@@ -24,6 +22,15 @@ set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in)
#set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
#set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX /home/tsg)
install(PROGRAMS build/program/certstore DESTINATION ./)
install(DIRECTORY resource/cert DESTINATION ./)
install(DIRECTORY resource/conf DESTINATION ./)
install(FILES resource/package/r2_certstore DESTINATION ./)
install(FILES resource/package/r3_certstore DESTINATION ./)
install(FILES resource/package/Makefile DESTINATION ./)
# Must uninstall the debug package before install release package
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CPACK_RPM_PACKAGE_CONFLICTS "certostre")

View File

@@ -1 +0,0 @@
systemctl stop sapp