create version

.gitlab-ci.yml

@@ -0,0 +1,203 @@
+image: "docker:stable"
+
+services:
+  - docker:dind
+
+variables:
+  GIT_STRATEGY: "clone"
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_DRIVER: overlay2
+  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+
+stages:
+  - build
+  - package
+  - release
+  - docker
+  
+.build_before_script:
+  before_script:
+    - mkdir -p /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_NAMESPACE/
+    - ln -s $CI_PROJECT_DIR /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_PATH
+    - cd /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_PATH
+    - echo "https://$USERNAME:$CI_TOKEN@git.mesalab.cn" > .git-credentials
+    - git config --global credential.helper 'store --file .git-credentials'
+    - git submodule sync --recursive
+    - git submodule update --init --recursive
+
+.mesa_plug:
+  extends: .build_before_script
+  image:  git.mesalab.cn:7443/ntc/soq_master:collect
+  script:
+    - source /etc/profile.d/MESA.sh
+    - mkdir -p build
+    - cd build
+    - cmake ..  -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_T1_MASTER=$T1_SWICTH -DENABLE_T2_MASTER=$T2_SWICTH -DENABLE_NTC_SWITCH=$NTC_SWITCH
+    - make
+    - make package
+
+build-soq:
+  stage: build
+  extends:   .mesa_plug
+  tags:
+    - share
+  variables:
+    BUILD_TYPE: "Debug"
+    T1_SWICTH: "ON"
+    T2_SWICTH: "ON"
+    NTC_SWITCH: "OFF"
+  except:
+    - tags
+
+build-ntc:
+  stage: build
+  extends:   .mesa_plug
+  tags:
+    - share
+  variables:
+    BUILD_TYPE: "Debug"
+    T1_SWICTH: "ON"
+    T2_SWICTH: "ON"
+    NTC_SWITCH: "ON"
+  except:
+    - tags
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    paths:
+      -  ./build/*.rpm
+
+t1-plug-soq:
+  stage: package
+  extends: .mesa_plug
+  tags:
+    - share
+  variables:
+    BUILD_TYPE: "Release"
+    T1_SWICTH: "ON"
+    T2_SWICTH: "OFF"
+    NTC_SWITCH: "OFF"
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    paths:
+      -  ./build/*.rpm
+  only:
+    - tags
+    
+t2-plug-soq:
+  stage: package
+  extends: .mesa_plug
+  tags:
+    - share
+  variables:
+    BUILD_TYPE: "Release"
+    T1_SWICTH: "OFF"
+    T2_SWICTH: "ON"
+    NTC_SWITCH: "OFF"
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    paths:
+      -  ./build/*.rpm
+  only:
+    - tags
+   
+t1-plug-ntc:
+  stage: package
+  extends: .mesa_plug
+  tags:
+    - share
+  variables:
+    BUILD_TYPE: "Release"
+    T1_SWICTH: "ON"
+    T2_SWICTH: "OFF"
+    NTC_SWITCH: "ON"
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    paths:
+      -  ./build/*.rpm
+  only:
+    - tags
+    
+t2-plug-ntc:
+  stage: package
+  extends: .mesa_plug
+  tags:
+    - share
+  variables:
+    BUILD_TYPE: "Release"
+    T1_SWICTH: "OFF"
+    T2_SWICTH: "ON"
+    NTC_SWITCH: "ON"
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    paths:
+      -  ./build/*.rpm
+  only:
+    - tags
+    
+t1-plug-soq-release:
+  stage: release
+  image: git.mesalab.cn:7443/ntc/soq_master:collect
+  tags:
+    - share
+  variables:
+    ARTIFACTS_JOB: "t1-plug-soq"
+    PROJECT_NAME: "t1-plug-soq"
+    USER_DEFINE: "release"
+  only:
+    - tags
+  script:
+    - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $PROJECT_NAME $USER_DEFINE
+    
+t2-plug-soq-release:
+  stage: release
+  image: git.mesalab.cn:7443/ntc/soq_master:collect
+  tags:
+    - share
+  variables:
+    ARTIFACTS_JOB: "t2-plug-soq"
+    PROJECT_NAME: "t2-plug-soq"
+    USER_DEFINE: "release"
+  only:
+    - tags
+  script:
+    - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $PROJECT_NAME $USER_DEFINE
+
+t1-plug-ntc-release:
+  stage: release
+  image: git.mesalab.cn:7443/ntc/soq_master:collect
+  tags:
+    - share
+  variables:
+    ARTIFACTS_JOB: "t1-plug-ntc"
+    PROJECT_NAME: "t1-plug-ntc"
+    USER_DEFINE: "release"
+  only:
+    - tags
+  script:
+    - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $PROJECT_NAME $USER_DEFINE
+ 
+t2-plug-ntc-release:
+  stage: release
+  image: git.mesalab.cn:7443/ntc/soq_master:collect
+  tags:
+    - share
+  variables:
+    ARTIFACTS_JOB: "t2-plug-ntc"
+    PROJECT_NAME: "t2-plug-ntc"
+    USER_DEFINE: "release"
+  only:
+    - tags
+  script:
+    - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $PROJECT_NAME $USER_DEFINE
+
+build-docker:
+  stage: docker
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $IMAGE_TAG .
+    - docker push $IMAGE_TAG
+  tags:
+    - share
+  only:
+    - master

.gitmodules

@@ -0,0 +1,21 @@
+[submodule "src/T1_HTTP_MAIL_BIZ"]
+	path = src/T1_HTTP_MAIL_BIZ
+	url = https://git.mesalab.cn/NTC/t1_http_mail_biz.git
+[submodule "src/T2_HTTP_MAIL_BIZ"]
+	path = src/T2_HTTP_MAIL_BIZ
+	url = https://git.mesalab.cn/NTC/t2_http_mail_biz.git
+[submodule "src/soq_dns_plug"]
+	path = src/soq_dns_plug
+	url = https://git.mesalab.cn/NTC/soq_dns_plug.git
+[submodule "src/ntc_http_collect"]
+	path = src/ntc_http_collect
+	url = https://git.mesalab.cn/PanGu/ntc_http_collect.git
+[submodule "src/ntc_ssl_collect"]
+	path = src/ntc_ssl_collect
+	url = https://git.mesalab.cn/PanGu/ntc_ssl_collect.git
+[submodule "src/ntc_ip_comm"]
+	path = src/ntc_ip_comm
+	url = https://git.mesalab.cn/PanGu/ntc_ip_comm.git
+[submodule "src/ntc_app_plug"]
+	path = src/ntc_app_plug
+	url = https://git.mesalab.cn/PanGu/ntc_app_plug.git

CMakeLists.txt

@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 2.8.10)
+
+option(ENABLE_T1_SWITCH "Enable t1 switch" TRUE)
+option(ENABLE_T2_SWITCH "Enable t2 switch" TRUE)
+option(ENABLE_NTC_SWITCH "Enable ntc switch" TRUE)
+
+if(ENABLE_NTC_SWITCH)
+	if(ENABLE_T1_SWITCH)
+		project(mesa_ntc_t1_plug)
+	endif()
+	if(ENABLE_T2_SWITCH)
+		project(mesa_ntc_t2_plug)
+	endif()
+	if(ENABLE_T1_SWITCH AND ENABLE_T2_SWITCH)
+		project(mesa_ntc_plug)
+	endif()
+	add_definitions(-DNTC_SWITCH=1)
+else()
+	if(ENABLE_T1_SWITCH)
+		project(mesa_soq_t1_plug)
+	endif()
+	if(ENABLE_T2_SWITCH)
+		project(mesa_soq_t2_plug)
+	endif()
+	if(ENABLE_T1_SWITCH AND ENABLE_T2_SWITCH)
+		project(mesa_soq_plug)
+	endif()
+endif()
+
+
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(Version)
+
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+
+if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+  message(SEND_ERROR "In-source builds are not allowed.")
+endif ()
+
+#set(CMAKE_VERBOSE_MAKEFILE ON)
+#set(CMAKE_COLOR_MAKEFILE   ON)
+set(ALLOW_DUPLICATE_CUSTOM_TARGETS TRUE)
+set(CMAKE_INSTALL_PREFIX /home/mesasoft/sapp)
+set(CPACK_RPM_DEBUGINFO_PACKAGE ON)
+
+if(ENABLE_T1_SWITCH)
+	add_subdirectory(src/ntc_app_plug)
+	add_subdirectory(src/ntc_http_collect)
+	add_subdirectory(src/ntc_ip_comm)
+	add_subdirectory(src/ntc_ssl_collect)
+	add_subdirectory(src/soq_dns_plug)
+	add_subdirectory(src/T1_HTTP_MAIL_BIZ)
+endif()
+
+if(ENABLE_T2_SWITCH)
+	add_subdirectory(src/T2_HTTP_MAIL_BIZ)
+endif()
+
+include(Package)

autorelease.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+if [ $# -lt 8 ] ; then
+    echo "USAGE: ./autorelease.sh [API_V4_URL] [PROJECT_URL]
+    [PROJECT_ID] [TOKEN]
+    [COMMIT_TAG] [JOB] [PROJECT_NAME] [USER_DEFINE]"
+    echo "$1; $2; $3; $4; $5; $6; $7; $8"
+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
+USER_DEFINE=$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-$USER_DEFINE-$CI_COMMIT_TAG.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-$USER_DEFINE-$CI_COMMIT_TAG.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/Package.cmake

@@ -0,0 +1,41 @@
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-debug")
+else()
+    set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+endif()
+
+message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
+
+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_COMPONENTS_ALL devel)
+set(CPACK_RPM_PACKAGE_DEBUG 1)
+set(CPACK_RPM_COMPONENT_INSTALL OFF)
+set(CPACK_RPM_DEVEL_FILE_NAME "${PROJECT_NAME}-devel.rpm")
+set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${PROJECT_NAME}-devel-debuginfo.rpm")
+
+# 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_VENDOR "MESA")
+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}")
+
+# Must uninstall the debug package before install release package
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CPACK_RPM_PACKAGE_CONFLICTS "${PROJECT_NAME}-debug")
+else()
+    set(CPACK_RPM_PACKAGE_CONFLICTS ${PROJECT_NAME})
+    #    set(CPACK_STRIP_FILES TRUE)
+endif()
+
+include(CPack)

cmake/Version.cmake

@@ -0,0 +1,44 @@
+
+# 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}")
+
+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})