✨feat: 使用cmake编译，并支持自动版本号

.gitignore

@@ -1,10 +1,2 @@
-*.o
+build/
-*.a
+version.txt
-tcpdump.1
-tcpdump
-Makefile
-version.c
-config.h
-config.log
-config.status
-tcpdump_mesa

CMakeLists.txt

@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 2.8)
+
+set(project_name tcpdump_mesa)
+
+project(${project_name})
+
+set(CMAKE_INSTALL_PREFIX /opt/MESA/)
+
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(Version)
+
+set(CMAKE_MACOSX_RPATH 0)
+
+execute_process(COMMAND ../configure WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+execute_process(COMMAND make CFLAGS+=-DGIT_VERSION=\\"${GIT_VERSION}\\" WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+
+# install the minidump tools to target binary dir
+install(PROGRAMS ${CMAKE_BINARY_DIR}/tcpdump DESTINATION ./bin/tcpdump_mesa COMPONENT EXECUTABLE)
+
+include(Package)

autorelease.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+if [ $# -lt 7 ] ; then
+    echo "USAGE: ./autorelease.sh [API_V4_URL] [PROJECT_URL]
+    [PROJECT_ID] [TOKEN]
+    [COMMIT_TAG] [JOB] [PROJECT_NAME] [COMMIT_REF_PROTECTED] [COMMIT_SHORT_SHA]"
+exit 1;
+fi
+
+CI_API_V4_URL=$1
+CI_PROJECT_URL=$2
+CI_PROJECT_ID=$3
+CI_TOKEN=$4
+CI_COMMIT_TAG=$5
+ARTIFACTS_JOB=$6
+CI_PROJECT_NAME=$7
+CI_COMMIT_SHORT_SHA=$8
+
+res=`echo -e "curl --header \"PRIVATE-TOKEN: $CI_TOKEN\" $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/$CI_COMMIT_TAG -o /dev/null -s -w %{http_code}"| /bin/bash`
+
+if [[ $res == "200" ]]; then
+    eval $(echo -e "curl --request POST --header \"PRIVATE-TOKEN: $CI_TOKEN\" \
+        --data name=\"$CI_PROJECT_NAME-$CI_COMMIT_TAG-$CI_COMMIT_SHORT_SHA-artifacts.zip\" \
+        --data url=\"$CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_TAG/download?job=$ARTIFACTS_JOB\"\
+        $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/$CI_COMMIT_TAG/assets/links")
+else
+    eval $(echo -e "curl --header 'Content-Type: application/json' --header \
+        \"PRIVATE-TOKEN: $CI_TOKEN\" --data '{ \"name\": \"$CI_COMMIT_TAG\",  \
+        \"tag_name\": \"$CI_COMMIT_TAG\", \"description\": \"auto_release\",\
+        \"assets\": { \"links\": [{ \"name\": \
+        \"$CI_PROJECT_NAME-$CI_COMMIT_TAG-$CI_COMMIT_SHORT_SHA-artifacts.zip\", \"url\": \
+        \"$CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_TAG/download?job=$ARTIFACTS_JOB\"\
+    }] } }' --request POST $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/")
+fi

cmake/FindSYSTEMD.cmake

@@ -0,0 +1,39 @@
+# - Find SystemdDaemon
+# Find the systemd daemon library
+#
+# This module defines the following variables:
+#   SYSTEMD_FOUND  -  True if library and include directory are found
+# If set to TRUE, the following are also defined:
+#   SYSTEMD_INCLUDE_DIRS  -  The directory where to find the header file
+#   SYSTEMD_LIBRARIES  -  Where to find the library file
+#
+# For conveniance, these variables are also set. They have the same values
+# than the variables above.  The user can thus choose his/her prefered way
+# to write them.
+#   SYSTEMD_LIBRARY
+#   SYSTEMD_INCLUDE_DIR
+#
+# This file is in the public domain
+
+include(FindPkgConfig)
+pkg_check_modules(SYSTEMD libsystemd)
+
+if(NOT SYSTEMD_FOUND)
+  find_path(SYSTEMD_INCLUDE_DIRS NAMES systemd/sd-daemon.h
+    DOC "The Systemd include directory")
+
+  find_library(SYSTEMD_LIBRARIES NAMES systemd
+    DOC "The Systemd library")
+
+  # Use some standard module to handle the QUIETLY and REQUIRED arguments, and
+  # set SYSTEMD_FOUND to TRUE if these two variables are set.
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(SYSTEMD REQUIRED_VARS SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS)
+
+  if(SYSTEMD_FOUND)
+    set(SYSTEMD_LIBRARY ${SYSTEMD_LIBRARIES})
+    set(SYSTEMD_INCLUDE_DIR ${SYSTEMD_INCLUDE_DIRS})
+  endif()
+endif()
+
+mark_as_advanced(SYSTEMD_INCLUDE_DIRS SYSTEMD_LIBRARIES)

cmake/Package.cmake

@@ -0,0 +1,73 @@
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(MY_RPM_NAME_PREFIX "${project_name}-debug")
+else()
+    set(MY_RPM_NAME_PREFIX "${project_name}")
+endif()
+
+message(STATUS "Package: ${MY_RPM_NAME_PREFIX}")
+
+set(CPACK_PACKAGE_VECDOR "MESA")
+set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}")
+set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
+execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)
+
+# RPM Build
+set(CPACK_GENERATOR "RPM")
+set(CPACK_RPM_PACKAGE_VENDOR "MESA")
+set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
+set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on")
+set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
+set(CPACK_RPM_PACKAGE_DEBUG 1)
+
+set(CPACK_RPM_COMPONENT_INSTALL ON)
+set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
+set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
+set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
+
+set(CPACK_COMPONENT_EXECUTABLE_REQUIRED TRUE)
+set(CPACK_RPM_EXECUTABLE_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+
+set(CPACK_COMPONENT_EXECUTABLE_GROUP "executable")
+set(CPACK_COMPONENT_LIBRARY_GROUP "executable")
+set(CPACK_COMPONENT_PROFILE_GROUP "executable")
+
+set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
+set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
+set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_COMPONENT_HEADER_GROUP "header")
+
+set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME})
+set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
+
+set(CPACK_COMPONENTS_ALL LIBRARY HEADER EXECUTABLE PROFILE)
+
+set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
+
+set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
+set(CPACK_RPM_PACKAGE_AUTOREQ "no")
+
+# setup %config(noreplace)
+set(CPACK_RPM_EXECUTABLE_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/gdev.conf"
+                            "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/sapp.toml"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/send_raw_pkt.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/project_list.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/plugin.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/entrylist.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/plug/conflist.inf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/gdev_block.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/send_gdev.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/send_route.conf")
+
+# Must uninstall the debug package before install release package
+set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX})
+
+#    set(CPACK_STRIP_FILES TRUE)
+include(CPack)
+
+

cmake/Version.cmake

@@ -0,0 +1,49 @@
+
+# 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" VERSION_MAJOR "${VCS_TAG}")
+string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${VCS_TAG}")
+string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${VCS_TAG}")
+
+if(NOT VERSION_MAJOR)
+    set(VERSION_MAJOR 1)
+endif()
+
+if(NOT VERSION_MINOR)
+    set(VERSION_MINOR 0)
+endif()
+
+if(NOT VERSION_PATCH)
+    set(VERSION_PATCH 0)
+endif()
+
+set(VERSION "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}")
+set(VERSION_BUILD "${VCS_SHORT_HASH}")
+
+# print information
+message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
+
+option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to TRUE or FALSE" TRUE)
+
+if(DEFINE_GIT_VERSION)
+	set(GIT_VERSION
+			"${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
+	string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
+
+	add_definitions(-DGIT_VERSION=${GIT_VERSION})
+endif()

tcpdump.c

@@ -44,7 +44,6 @@
 #define MESA_DUMP		(1) 
 #if MESA_DUMP
 #include "mesa_pkt_dump.h"
-const int tcpdump_mesa_version_VERSION_20181114 = 20181114;
 int tcpdump_data_offset = 0; /* 用于跳过某些底层数据, 如vxlan, 可以直接获取或设置过滤条件看vxlan的内层数据包内容 */
 unsigned char tcpdump_thread_index_array[64]; /* 开启捕包线程id数组, 靠长度决定id数量, 每个占1字节, 命令行输入支持逗号分隔 */
 int tcpdump_thread_index_array_num = 0;
@@ -151,6 +150,12 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #include "print.h"
 
+#ifdef GIT_VERSION
+const char *tcpdump_mesa_version = (const char *)GIT_VERSION;
+#else
+const char *tcpdump_mesa_version = "GIT_VERSION_UNKNOWN";
+#endif
+
 #ifndef PATH_MAX
 #define PATH_MAX 1024
 #endif
@@ -3223,7 +3228,7 @@ print_usage(void)
 	(void)fprintf(stderr,
 "----------------------------------------------------------------------------------------------.\n");
 	(void)fprintf(stderr,
-"\t\tThe follow args is customized for tcpdump_mesa(%d):\n", tcpdump_mesa_version_VERSION_20181114);
+"\t\tThe follow args is customized for tcpdump_mesa(%s):\n", tcpdump_mesa_version);
 	(void)fprintf(stderr,
 "\t\t[ -a ] enable perceptive mode, can detect loss packet number.\n");
 	(void)fprintf(stderr,