From fab0aed7a4d987499716cbd8d7266874f150ccfe Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Tue, 26 Oct 2021 13:11:21 +0300 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8F=AF=E6=89=A7=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=9A=84=E5=90=8D=E7=A7=B0=E7=94=B1licence=5Ftool?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAhasp=5Fupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 10 +++++----- CMakeLists.txt | 4 ++-- ci/travis.sh | 6 +++--- cmake/Package.cmake | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ba7d4d..b773e30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: "git.mesalab.cn:7443/mesa_platform/build-env:master" variables: GIT_STRATEGY: "clone" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ - INSTALL_PREFIX: "/opt/tsg/licence_tool" + INSTALL_PREFIX: "/opt/tsg/hasp_update" TESTING_VERSION_BUILD: 0 stages: @@ -51,7 +51,7 @@ develop_build_debug: PULP3_REPO_NAME: tsg-testing-x86_64.el7 PULP3_DIST_NAME: tsg-testing-x86_64.el7 artifacts: - name: "licence_tool-develop-$CI_COMMIT_REF_NAME-debug" + name: "hasp_update-develop-$CI_COMMIT_REF_NAME-debug" paths: - build/*.rpm only: @@ -69,7 +69,7 @@ develop_build_release: PULP3_REPO_NAME: tsg-testing-x86_64.el7 PULP3_DIST_NAME: tsg-testing-x86_64.el7 artifacts: - name: "licence_tool-develop-$CI_COMMIT_REF_NAME-release" + name: "hasp_update-develop-$CI_COMMIT_REF_NAME-release" paths: - build/*.rpm only: @@ -86,7 +86,7 @@ release_build_debug: PULP3_DIST_NAME: tsg-stable-x86_64.el7 extends: .build_by_travis artifacts: - name: "licence_tool-install-$CI_COMMIT_REF_NAME-debug" + name: "hasp_update-install-$CI_COMMIT_REF_NAME-debug" paths: - build/*.rpm only: @@ -102,7 +102,7 @@ release_build_release: PULP3_DIST_NAME: tsg-stable-x86_64.el7 extends: .build_by_travis artifacts: - name: "licence_tool-install-$CI_COMMIT_REF_NAME-release" + name: "hasp_update-install-$CI_COMMIT_REF_NAME-release" paths: - build/*.rpm only: diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a41b02..7bc7eae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(licence_tool) +project(hasp_update) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) include(Version) @@ -14,7 +14,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set (CMAKE_INSTALL_PREFIX "/opt/tsg/licence_tool" CACHE PATH "default install path" FORCE ) + set (CMAKE_INSTALL_PREFIX "/opt/tsg/hasp_update" CACHE PATH "default install path" FORCE ) endif() # Global compile options diff --git a/ci/travis.sh b/ci/travis.sh index 3290ef0..2070d01 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -57,7 +57,7 @@ if [ -n "${PACKAGE}" ]; then fi if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then - rpm -i licence_tool*debuginfo*.rpm - cp /usr/lib/debug/opt/tsg/licence_tool/bin/licence_tool.debug /tmp/licence_tool.debuginfo.${CI_COMMIT_SHORT_SHA} - sentry-cli upload-dif -t elf /tmp/licence_tool.debuginfo.${CI_COMMIT_SHORT_SHA} + rpm -i hasp_update*debuginfo*.rpm + cp /usr/lib/debug/opt/tsg/hasp_update/bin/hasp_update.debug /tmp/hasp_update.debuginfo.${CI_COMMIT_SHORT_SHA} + sentry-cli upload-dif -t elf /tmp/hasp_update.debuginfo.${CI_COMMIT_SHORT_SHA} fi \ No newline at end of file diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 7aa367d..916aff1 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -1,7 +1,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_PACKAGE_NAME "licence_tool-debug") + set(CPACK_PACKAGE_NAME "hasp_update-debug") else() - set(CPACK_PACKAGE_NAME "licence_tool") + set(CPACK_PACKAGE_NAME "hasp_update") endif() message(STATUS "Package: ${CPACK_PACKAGE_NAME}") @@ -22,9 +22,9 @@ set(CPACK_RPM_DEBUGINFO_PACKAGE on) # Must uninstall the debug package before install release package if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_RPM_PACKAGE_CONFLICTS "licence_tool") + set(CPACK_RPM_PACKAGE_CONFLICTS "hasp_update") else() - set(CPACK_RPM_PACKAGE_CONFLICTS "licence_tool-debug") + set(CPACK_RPM_PACKAGE_CONFLICTS "hasp_update-debug") endif() include(CPack) \ No newline at end of file