fix build RPM package, update cmake/Preinsall, cmake/PreUninstallv0.0.1

9 files changed, 88 insertions, 75 deletions

diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 0ad6569..f2b7bc4 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -1,43 +1,54 @@
-cmake_minimum_required(VERSION 3.12)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CPACK_PACKAGE_NAME ${PROJECT_NAME}-debug)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(MY_RPM_NAME_PREFIX "${lib_name}-debug")
 else()
-    set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+    set(MY_RPM_NAME_PREFIX "${lib_name}")
 endif()
 
-message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
+message(STATUS "Package: ${MY_RPM_NAME_PREFIX}")
 
-set(CPACK_PACKAGE_VENDOR "TSG")
-set(CPACK_PACKAGE_VERSION_MAJOR "${HTTP_DECODER_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${HTTP_DECODER_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${HTTP_DECODER_VERSION_PATCH}.${HTTP_DECODER_DESCRIBE}")
+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 sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
+SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt)
 
 # 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_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
+set(CPACK_RPM_PACKAGE_VENDOR "MESA")
+set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
+set(CPACK_RPM_PACKAGE_RELEASE_DIST "on")
+set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
 
 set(CPACK_RPM_COMPONENT_INSTALL ON)
-set(CPACK_COMPONENTS_ALL Libraries Headers)
+set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
+set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
+set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
+
+set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
+set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_COMPONENT_PROFILE_GROUP "LIBRARIES")
+set(CPACK_COMPONENT_LIBRARIES_GROUP "LIBRARIES")
 
-set(CPACK_RPM_HEADERS_PACKAGE_NAME "${CPACK_PACKAGE_NAME}-devel")
-set(CPACK_RPM_LIBRARIES_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
+set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
+set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
+set(CPACK_COMPONENT_HEADER_GROUP "HEADER")
+
+set(CPACK_COMPONENTS_ALL HEADER PROFILE LIBRARIES)
 
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
 set(CPACK_RPM_PACKAGE_AUTOREQ "no")
 
-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_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in)
-set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
+set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
 
-set(CPACK_RPM_HEADERS_PACKAGE_CONFLICTS ${CPACK_RPM_HEADERS_PACKAGE_NAME})
+# Must uninstall the debug package before install release package
+set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
 set(CPACK_RPM_LIBRARIES_PACKAGE_CONFLICTS ${CPACK_RPM_LIBRARIES_PACKAGE_NAME})
+
+#    set(CPACK_STRIP_FILES TRUE)
 include(CPack)
diff --git a/cmake/PostInstall.in b/cmake/PostInstall.sh
index d601599..d601599 100644
--- a/cmake/PostInstall.in
+++ b/cmake/PostInstall.sh
diff --git a/cmake/PostUninstall.in b/cmake/PostUninstall.in
deleted file mode 100644
index d601599..0000000
--- a/cmake/PostUninstall.in
+++ /dev/null
@@ -1 +0,0 @@
-/sbin/ldconfig
\ No newline at end of file
diff --git a/cmake/PreInstall.in b/cmake/PreInstall.in
deleted file mode 100644
index ea89e39..0000000
--- a/cmake/PreInstall.in
+++ /dev/null
@@ -1,22 +0,0 @@
-DST=${RPM_INSTALL_PREFIX}/sapp/
-
-mkdir -p ${DST}/plug/stellar_on_sapp
-mkdir -p ${DST}/stellar_plugin/
-touch ${DST}/stellar_plugin/spec.toml
-touch ${DST}/plug/conflist.inf
-
-if ! grep -q '^\./plug/stellar_on_sapp/start_loader.inf$' "${DST}/plug/conflist.inf"; then
-    if grep -q '^\[platform\]$' "${DST}/plug/conflist.inf"; then
-        sed -i '/^\[platform\]$/a\./plug/stellar_on_sapp/start_loader.inf' "${DST}/plug/conflist.inf"
-    else
-        echo -e "[platform]\n./plug/stellar_on_sapp/start_loader.inf" >> "${DST}/plug/conflist.inf"
-    fi
-fi
-
-if ! grep -q '^\./plug/stellar_on_sapp/defer_loader.inf$' "${DST}/plug/conflist.inf"; then
-    if grep -q '^\[business\]$' "${DST}/plug/conflist.inf"; then
-        sed -i '/^\[business\]$/a\./plug/stellar_on_sapp/defer_loader.inf' "${DST}/plug/conflist.inf"
-    else
-        echo -e "[business]\n./plug/stellar_on_sapp/defer_loader.inf" >> "${DST}/plug/conflist.inf"
-    fi
-fi
\ No newline at end of file
diff --git a/cmake/PreInstall.sh b/cmake/PreInstall.sh
new file mode 100644
index 0000000..db2b917
--- /dev/null
+++ b/cmake/PreInstall.sh
@@ -0,0 +1,13 @@
+DST=${RPM_INSTALL_PREFIX}/sapp/
+
+mkdir -p ${DST}/stellar_plugin
+touch ${DST}/stellar_plugin/spec.toml
+
+if ! grep -q '^\./plug/stellar_plugin/http_decoder.so' "${DST}/stellar_plugin/spec.toml"; then
+    echo -e "\n" >> "${DST}/stellar_plugin/spec.toml"
+    echo -e "[[plugin]]" >> "${DST}/stellar_plugin/spec.toml"
+    echo -e "path = \"./stellar_plugin/http_decoder/http_decoder.so\"" >> "${DST}/stellar_plugin/spec.toml"
+    echo -e "init = \"http_decoder_init\"" >> "${DST}/stellar_plugin/spec.toml"
+    echo -e "exit = \"http_decoder_exit\"" >> "${DST}/stellar_plugin/spec.toml"
+    echo -e "\n" >> "${DST}/stellar_plugin/spec.toml"
+fi
diff --git a/cmake/PreUninstall.in b/cmake/PreUninstall.in
deleted file mode 100644
index dc0aa5e..0000000
--- a/cmake/PreUninstall.in
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ $1 == 0 ]; then
-	DST=${RPM_INSTALL_PREFIX}/sapp
-	sed -i '/start_loader.inf/d' ${DST}/plug/conflist.inf
-	sed -i '/defer_loader.inf/d' ${DST}/plug/conflist.inf
-	rm ${DST}/stellar_plugin -rf
-fi
diff --git a/cmake/PreUninstall.sh b/cmake/PreUninstall.sh
new file mode 100644
index 0000000..a704de5
--- /dev/null
+++ b/cmake/PreUninstall.sh
@@ -0,0 +1,6 @@
+if [ $1 == 0 ]; then
+	DST=${RPM_INSTALL_PREFIX}/sapp/stellar_plugin
+	sed -i -n '$!N;/http_decoder.so/!P;D' ${DST}/spec.toml
+	sed -i '/http_decoder_init/d' ${DST}/spec.toml
+	sed -i '/http_decoder_exit/d' ${DST}/spec.toml
+fi
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 2492869..ba431d0 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,4 +1,6 @@
+
 # 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_BINARY_DIR}/version.txt)
@@ -8,40 +10,45 @@ 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})
+# 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" HTTP_DECODER_VERSION_MAJOR "${VCS_TAG}")
-string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" HTTP_DECODER_VERSION_MINOR "${VCS_TAG}")
-string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" HTTP_DECODER_VERSION_PATCH "${VCS_TAG}")
-string(REGEX REPLACE "[T\\:\\+\\-]" "" HTTP_DECODER_VERSION_DATE "${VCS_DATE}")
+# 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}")
+string(REGEX REPLACE "[T\\:\\+\\-]" "" VERSION_DATE "${VCS_DATE}")
 
-if(STELLAR_VERSION_DAILY_BUILD)
-	set(HTTP_DECODER_VERSION_PATCH ${HTTP_DECODER_VERSION_PATCH}.${HTTP_DECODER_VERSION_DATE})
+if(VERSION_DAILY_BUILD)
+	set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE})
 endif()
 
-if(NOT HTTP_DECODER_VERSION_MAJOR)
-	set(HTTP_DECODER_VERSION_MAJOR 1)
+if(NOT VERSION_MAJOR)
+    set(VERSION_MAJOR 1)
 endif()
 
-if(NOT HTTP_DECODER_VERSION_MINOR)
-	set(HTTP_DECODER_VERSION_MINOR 0)
+if(NOT VERSION_MINOR)
+    set(VERSION_MINOR 0)
 endif()
 
-if(NOT HTTP_DECODER_VERSION_PATCH)
-	set(HTTP_DECODER_VERSION_PATCH 0)
+if(NOT VERSION_PATCH)
+    set(VERSION_PATCH 0)
 endif()
 
-set(HTTP_DECODER_DESCRIBE "${VCS_SHORT_HASH}")
-set(STELLAR_VERSION "${HTTP_DECODER_VERSION_MAJOR}.${HTTP_DECODER_VERSION_MINOR}.${HTTP_DECODER_VERSION_PATCH}")
-set(HTTP_DECODER_GIT_VERSION "${HTTP_DECODER_VERSION_MAJOR}.${HTTP_DECODER_VERSION_MINOR}.${HTTP_DECODER_VERSION_PATCH}-${HTTP_DECODER_DESCRIBE}")
+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)
 
-# Replace .- with _
-string(REGEX REPLACE "[\\.\\-]" "_" STELLAR_VAR_VERSION "${HTTP_DECODER_GIT_VERSION}")
+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})
 
-# Print information
-message(STATUS "Welcome to stateful network function development platform, Version: ${HTTP_DECODER_GIT_VERSION}")
-add_definitions(-DHTTP_DECODER_GIT_VERSION=\"${HTTP_DECODER_GIT_VERSION}\")
-add_definitions(-DHTTP_DECODER_VAR_VERSION=${HTTP_DECODER_VAR_VERSION})
\ No newline at end of file
+	add_definitions(-DGIT_VERSION=${GIT_VERSION})
+endif()
\ No newline at end of file
diff --git a/cmake/changelog.sh b/cmake/changelog.sh
new file mode 100644
index 0000000..56a0c74
--- /dev/null
+++ b/cmake/changelog.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+work_path=$1
+branch=`git status | grep branch | awk '{print $NF}'`
+git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %cd %an %ae %nhash: %H%ncommit:%n%B"  | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/  -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt
+