From 1e14cf83ca7fe9fccba544a95a2eb8e5608be750 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Fri, 1 May 2020 16:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=8A=E4=BC=A0yum?= =?UTF-8?q?=E6=BA=90(https://repo.geedge.net/pulp/content/7/x86=5F64/stabl?= =?UTF-8?q?e/tsg/)=20rpm=E4=B8=AD=E5=A2=9E=E5=8A=A0changelog=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 162 ++++++++++++++++++-------------------- CMakeLists.txt | 1 + bin/fw_dns_plug.inf | 2 +- ci/get-nprocessors.sh | 48 +++++++++++ ci/perpare_pulp3_netrc.sh | 3 + ci/travis.sh | 64 +++++++++++++++ cmake/Package.cmake | 49 +++++++----- cmake/Version.cmake | 12 ++- cmake/changelog.sh | 4 + src/CMakeLists.txt | 4 +- src/fw_dns_plug.cpp | 2 +- 11 files changed, 243 insertions(+), 108 deletions(-) create mode 100644 ci/get-nprocessors.sh create mode 100644 ci/perpare_pulp3_netrc.sh create mode 100644 ci/travis.sh create mode 100644 cmake/changelog.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 954bff5..22bffe5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,110 +1,104 @@ -image: "docker:stable" - -services: - - docker:dind - +image: "git.mesalab.cn:7443/mesa_platform/build-env:master" variables: GIT_STRATEGY: "clone" - IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ + INSTALL_PREFIX: "/home/mesasoft/sapp_run/" + INSTALL_DEPENDENCY_LIBRARY: libMESA_handle_logger-devel libcjson-devel libMESA_field_stat2-devel sapp-devel framework_env libMESA_prof_load-devel http-devel dns-devel ftp-devel mail-devel ssl-devel librdkafka-devel libmaatframe-devel tsg_master-devel libdocumentanalyze-devel stages: - - build - - package - - release - -.build_before_script: +- build + +.build_by_travis: 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 - -.build_fw_dns_plug: - extends: .build_before_script - image: git.mesalab.cn:7443/tango/tsg_master:master + - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/ + - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH + - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH + - chmod +x ./ci/travis.sh script: - - source /etc/profile.d/MESA.sh - - mkdir -p build - - cd build - - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE - - make - - make package - -.package_fw_dns_plug: - extends: .build_before_script - image: git.mesalab.cn:7443/tango/tsg_master:master - script: - - source /etc/profile.d/MESA.sh - - mkdir -p build - - cd build - - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE - - make package + - yum makecache + - ./ci/travis.sh + - cd build + tags: + - share -build: +branch_build_debug: stage: build - extends: .build_fw_dns_plug - tags: - - share + extends: .build_by_travis variables: - BUILD_TYPE: "Debug" - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" - paths: - - ./build/*.rpm + BUILD_TYPE: Debug except: + - /^develop.*$/i + - /^master.*$/i - tags -fw_dns_plug_debug: - stage: package - extends: .package_fw_dns_plug - tags: - - share +branch_build_release: + stage: build variables: - BUILD_TYPE: "Debug" + BUILD_TYPE: RelWithDebInfo + extends: .build_by_travis + except: + - /^develop.*$/i + - /^master.*$/i + - tags + +develop_build_debug: + stage: build + extends: .build_by_travis + variables: + BUILD_TYPE: Debug + PACKAGE: 1 artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + name: "fw_dns_plug-$CI_COMMIT_REF_NAME-debug" paths: - - ./build/*.rpm + - build/*.rpm only: - - tags - -fw_dns_plug_release: - stage: package - extends: .package_fw_dns_plug - tags: - - share + - /^develop.*$/i + - /^master.*$/i + +develop_build_release: + stage: build + extends: .build_by_travis variables: - BUILD_TYPE: "Release" + BUILD_TYPE: RelWithDebInfo + PACKAGE: 1 artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + name: "fw_dns_plug-$CI_COMMIT_REF_NAME-release" paths: - - ./build/*.rpm + - build/*.rpm only: - - tags - -fw_dns_plug_release-release: - stage: release - image: git.mesalab.cn:7443/tango/tsg_master:master - tags: - - share + - /^develop.*$/i + - /^master.*$/i + + +release_build_release: + stage: build variables: - ARTIFACTS_JOB: "fw_dns_plug_release" - PROJECT_NAME: "fw-dns-plug" - USER_DEFINE: "release" + BUILD_TYPE: RelWithDebInfo + PACKAGE: 1 + UPLOAD: 1 + PULP3_REPO_NAME: tsg-stable-x86_64.el7 + PULP3_DIST_NAME: tsg-stable-x86_64.el7 + extends: .build_by_travis + artifacts: + name: "fw_dns_plug-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm 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 - -fw_dns_plug_debug-release: - stage: release - image: git.mesalab.cn:7443/tango/tsg_master:master - tags: - - share + +release_build_release_devel: + stage: build variables: - ARTIFACTS_JOB: "fw_dns_plug_debug" - PROJECT_NAME: "fw-dns-plug" - USER_DEFINE: "debug" + BUILD_TYPE: RelWithDebInfo + ENABLE_DEVEL_SWITCH: "ON" + PACKAGE: 1 + UPLOAD: 1 + PULP3_REPO_NAME: tsg-stable-x86_64.el7 + PULP3_DIST_NAME: tsg-stable-x86_64.el7 + extends: .build_by_travis + artifacts: + name: "fw_dns_plug-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm 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 \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index f4962b7..7cdf294 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required (VERSION 2.8) +set(lib_name fw_dns_plug) project(fw_dns_plug) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) diff --git a/bin/fw_dns_plug.inf b/bin/fw_dns_plug.inf index 922cb6d..0bd94cf 100644 --- a/bin/fw_dns_plug.inf +++ b/bin/fw_dns_plug.inf @@ -2,7 +2,7 @@ PLUGNAME=FW_DNS_PLUG SO_PATH=./plug/business/fw_dns_plug/fw_dns_plug.so INIT_FUNC=FW_DNS_PLUG_INIT -DESTROY_FUNC=FW_DNS_PLUG_DESTORY +DESTROY_FUNC=FW_DNS_PLUG_DESTROY [DNS] FUNC_FLAG=DNS_ALL diff --git a/ci/get-nprocessors.sh b/ci/get-nprocessors.sh new file mode 100644 index 0000000..43635e7 --- /dev/null +++ b/ci/get-nprocessors.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash +# Copyright 2017 Google Inc. +# All Rights Reserved. +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# This file is typically sourced by another script. +# if possible, ask for the precise number of processors, +# otherwise take 2 processors as reasonable default; see +# https://docs.travis-ci.com/user/speeding-up-the-build/#Makefile-optimization +if [ -x /usr/bin/getconf ]; then + NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN) +else + NPROCESSORS=2 +fi + +# as of 2017-09-04 Travis CI reports 32 processors, but GCC build +# crashes if parallelized too much (maybe memory consumption problem), +# so limit to 4 processors for the time being. +if [ $NPROCESSORS -gt 4 ] ; then + echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4." + NPROCESSORS=4 +fi diff --git a/ci/perpare_pulp3_netrc.sh b/ci/perpare_pulp3_netrc.sh new file mode 100644 index 0000000..8414bbb --- /dev/null +++ b/ci/perpare_pulp3_netrc.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh +set -evx +echo "machine ${PULP3_SERVER_URL}\nlogin ${PULP3_SERVER_LOGIN}\npassword ${PULP3_SERVER_PASSWORD}\n" > ~/.netrc diff --git a/ci/travis.sh b/ci/travis.sh new file mode 100644 index 0000000..40a2780 --- /dev/null +++ b/ci/travis.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env sh +set -evx + +chmod +x ci/get-nprocessors.sh +. ci/get-nprocessors.sh + +# if possible, ask for the precise number of processors, +# otherwise take 2 processors as reasonable default; see +# https://docs.travis-ci.com/user/speeding-up-the-build/#Makefile-optimization +if [ -x /usr/bin/getconf ]; then + NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN) +else + NPROCESSORS=2 +fi + +# as of 2017-09-04 Travis CI reports 32 processors, but GCC build +# crashes if parallelized too much (maybe memory consumption problem), +# so limit to 4 processors for the time being. +if [ $NPROCESSORS -gt 4 ] ; then + echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4." + NPROCESSORS=4 +fi + +# Tell make to use the processors. No preceding '-' required. +MAKEFLAGS="j${NPROCESSORS}" +export MAKEFLAGS + +env | sort + +# Set default values to OFF for these variables if not specified. +: "${NO_EXCEPTION:=OFF}" +: "${NO_RTTI:=OFF}" +: "${COMPILER_IS_GNUCXX:=OFF}" + +# Install dependency from YUM +if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then + yum install -y $INSTALL_DEPENDENCY_LIBRARY + source /etc/profile.d/framework.sh +fi +mkdir build || true +cd build + +cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ + -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ + -DENABLE_DEVEL=$ENABLE_DEVEL_SWITCH \ + .. + +make + +if [ -n "${PACKAGE}" ]; then + make package +fi + +if [ -n "${UPLOAD}" ]; then + cp ~/rpm_upload_tools.py ./ + python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm +fi + +#if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then +# rpm -i tfe*debuginfo*.rpm +# cp /usr/lib/debug/opt/tsg/tfe/bin/tfe.debug /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA} +# sentry-cli upload-dif -t elf /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA} +#fi diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 69bc509..81d4130 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -1,41 +1,52 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-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_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) -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") +#execute_process(COMMAND sh changelog.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake) +#SET(CPACK_RPM_CHANGELOG_FILE ${PROJECT_SOURCE_DIR}/cmake/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_VENDOR "MESA") -set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") -set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) -set(CPACK_RPM_DEBUGINFO_PACKAGE ON) +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_LIBRARY_REQUIRED TRUE) +set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) +set(CPACK_RPM_LIBRARY_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") + +set(CPACK_COMPONENT_LIBRARY_GROUP "library") +set(CPACK_COMPONENT_PROFILE_GROUP "library") + +set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) + +set(CPACK_COMPONENTS_ALL LIBRARY PROFILE) 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() +set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX}) +# set(CPACK_STRIP_FILES TRUE) include(CPack) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index b7d6110..752f20f 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -1,3 +1,4 @@ + # Using autorevision.sh to generate version information set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh) @@ -37,7 +38,16 @@ set(VERSION_BUILD "${VCS_SHORT_HASH}") # print information message(STATUS "Version: ${VERSION}-${VERSION_BUILD}") +if(NOT DEFINE_GIT_VERSION) + option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" OFF) + 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}) + +if(DEFINE_GIT_VERSION) + add_definitions(-DGIT_VERSION=${GIT_VERSION}) + option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON) +endif() + +endif() diff --git a/cmake/changelog.sh b/cmake/changelog.sh new file mode 100644 index 0000000..7d8bf7f --- /dev/null +++ b/cmake/changelog.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +branch=`git status | grep branch | awk '{print $NF}'` +git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %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' > changelog.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5304d76..6d90e4b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,6 +14,6 @@ add_library(fw_dns_plug SHARED ${SRC}) target_link_libraries(fw_dns_plug ${FW_DNS_PLUG_DEPEND_DYN_LIB}) set_target_properties(fw_dns_plug PROPERTIES PREFIX "") -install(TARGETS fw_dns_plug DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/fw_dns_plug) -install(FILES ../bin/fw_dns_plug.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/fw_dns_plug) +install(TARGETS fw_dns_plug LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/fw_dns_plug COMPONENT LIBRARY) +install(FILES ../bin/fw_dns_plug.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/fw_dns_plug COMPONENT PROFILE) diff --git a/src/fw_dns_plug.cpp b/src/fw_dns_plug.cpp index 3811e97..2f51776 100644 --- a/src/fw_dns_plug.cpp +++ b/src/fw_dns_plug.cpp @@ -480,7 +480,7 @@ extern "C" int FW_DNS_PLUG_INIT(void) } -extern "C" void FW_DNS_PLUG_DESTORY(void) +extern "C" void FW_DNS_PLUG_DESTROY(void) { return ; }