增加自动版本标记脚本,从Tag中提取版本号,自动生成nm | grep VERSION方式查看的版本号。

This commit is contained in:
Lu Qiuwen
2018-10-11 20:08:22 +08:00
parent 72b931b02a
commit 70fbff5b7d
8 changed files with 1383 additions and 0 deletions

View File

@@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.5)
project(tfe)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
include(Version)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_C_STANDARD 11)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

1268
autorevision.sh Normal file

File diff suppressed because it is too large Load Diff

41
cmake/Package.cmake Normal file
View File

@@ -0,0 +1,41 @@
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CPACK_PACKAGE_NAME "tfe-debug")
else()
set(CPACK_PACKAGE_NAME "tfe")
endif()
message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
set(CPACK_PACKAGE_VENDOR "MESASOFT")
set(CPACK_PACKAGE_VERSION_MAJOR "${TFE_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${TFE_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${TFE_VERSION_PATCH}.${TFE_VERSION_BUILD}")
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
# RPM Build
set(CPACK_GENERATOR "RPM")
set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
set(CPACK_RPM_DEBUGINFO_PACKAGE on)
set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.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)
# Must uninstall the debug package before install release package
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CPACK_RPM_PACKAGE_CONFLICTS "tfe")
else()
set(CPACK_RPM_PACKAGE_CONFLICTS "tfe-debug")
endif()
# setup %config(noreplace)
set(CPACK_RPM_USER_FILELIST "/usr/lib/systemd/system/mrenv.service"
"/usr/lib/systemd/system/mrzcpd.service"
"/usr/lib/systemd/system/mrtunnat.service"
"/usr/lib/systemd/system/mrmonit.service"
"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/mrglobal.conf"
"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/mrtunnat.conf"
"%config(noreplace) /etc/sysconfig/mrzcpd")
include(CPack)

2
cmake/PostInstall.in Normal file
View File

@@ -0,0 +1,2 @@
%systemd_post mrenv.service mrzcpd.service mrtunnat.service
/sbin/ldconfig

2
cmake/PostUninstall.in Normal file
View File

@@ -0,0 +1,2 @@
%systemd_postun_with_restart mrenv.service mrzcpd.service mrtunnat.service
/sbin/ldconfig

1
cmake/PreUninstall.in Normal file
View File

@@ -0,0 +1 @@
%systemd_preun mrenv.service mrzcpd.service mrtunnat.service

47
cmake/Version.cmake Normal file
View File

@@ -0,0 +1,47 @@
# Using autorevision.sh to generate version information
set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh)
set(__VERSION_CACHE ${CMAKE_SOURCE_DIR}/version.txt)
set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake)
file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
# execute autorevision.sh to generate version information
execute_process(COMMAND ${__AUTORESIVISION} -t cmake -o ${__VERSION_CACHE} OUTPUT_FILE ${__VERSION_CONFIG} ERROR_QUIET)
include(${__VERSION_CONFIG})
# extract major, minor, patch version from git tag
string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" TFE_VERSION_MAJOR "${VCS_TAG}")
string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" TFE_VERSION_MINOR "${VCS_TAG}")
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" TFE_VERSION_PATCH "${VCS_TAG}")
if(NOT TFE_VERSION_MAJOR)
set(TFE_VERSION_MAJOR 3)
endif()
if(NOT TFE_VERSION_MINOR)
set(TFE_VERSION_MINOR 0)
endif()
if(NOT TFE_VERSION_PATCH)
set(TFE_VERSION_PATCH 0)
endif()
set(TFE_VERSION "${TFE_VERSION_MAJOR}.${TFE_VERSION_MINOR}.${TFE_VERSION_PATCH}")
set(TFE_DESCRIBE "${VCS_SHORT_HASH}")
set(TFE_GIT_VERSION "${TFE_VERSION_MAJOR}.${TFE_VERSION_MINOR}.${TFE_VERSION_PATCH}-${TFE_VERSION_BUILD}")
set(TFE_VAR_VERSION "${TFE_VERSION_MAJOR}_${TFE_VERSION_MINOR}_${TFE_VERSION_PATCH}_${TFE_DESCRIBE}")
# system information
execute_process(COMMAND uname -r OUTPUT_VARIABLE TFE_VERSION_KERNEL)
# print information
message(STATUS "TFE Version: ${TFE_GIT_VERSION}")
message(STATUS "Kernel Version: ${TFE_VERSION_KERNEL}")
add_definitions(-DTFE_GIT_VERSION=\"${TFE_GIT_VERSION}\")
add_definitions(-DTFE_VAR_VERSION=${TFE_VAR_VERSION})

View File

@@ -45,6 +45,25 @@ struct tfe_proxy * g_default_proxy = NULL;
thread_local unsigned int __currect_thread_id = 0;
thread_local void * __currect_default_logger = NULL;
#define TFE_VAR_VERSION_CATTER(v) static __attribute__((__used__)) const char * TFE_VERSION_version_##v = NULL
#define TFE_VAR_VERSION_EXPEND(v) TFE_VAR_VERSION_CATTER(v)
/* VERSION TAG */
#ifdef TFE_VAR_VERSION
TFE_VAR_VERSION_EXPEND(TFE_VAR_VERSION);
#else
static __attribute__((__used__)) const char * TFE_VERSION_version_UNKNOWN = NULL;
#endif
#undef TFE_VAR_VERSION_CATTER
#undef TFE_VAR_VERSION_EXPEND
/* VERSION STRING */
#ifdef TFE_GIT_VERSION
static __attribute__((__used__)) const char * tfe_version = TFE_GIT_VERSION;
#else
static __attribute__((__used__)) const char * tfe_version = "Unknown";
#endif
struct tfe_thread_ctx * tfe_proxy_thread_ctx_acquire(struct tfe_proxy * ctx)
{
unsigned int min_thread_id = 0;