From 8de52b066fbe641faae2ac626f0d2dfdbfa9dc52 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Wed, 18 May 2022 08:03:10 +0800 Subject: [PATCH] [akali] Update string replace method to embed AKALI_STATIC (#24741) * [teemo] Update to v2.7 * [teemo] Format manifest * [teemo] Update to v2.7 * [akali] Update to v1.43 * [akali] Update to v1.43 * [akali] Update to v1.43 * overwrite version * add license * overwrite version * [akali] Update string replace method. * [akali] run x-add-version command. Co-authored-by: FrankXie Co-authored-by: admin --- ports/akali/portfile.cmake | 6 ++---- ports/akali/vcpkg.json | 1 + versions/a-/akali.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index f489f6e263..3ed9ff3641 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -25,13 +25,11 @@ elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/akali") vcpkg_cmake_config_fixup(CONFIG_PATH share/akali) endif() -file(READ "${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "${AKALI_EXPORT_H}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "#ifdef AKALI_STATIC" "#if 1" AKALI_EXPORT_H "${AKALI_EXPORT_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 1") else() - string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 0") endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "${AKALI_EXPORT_H}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/akali/vcpkg.json b/ports/akali/vcpkg.json index aa2f9c420e..c06a223e7b 100644 --- a/ports/akali/vcpkg.json +++ b/ports/akali/vcpkg.json @@ -1,6 +1,7 @@ { "name": "akali", "version": "1.43", + "port-version": 1, "description": "C++ Common Library.", "homepage": "https://github.com/winsoft666/akali", "license": "MIT", diff --git a/versions/a-/akali.json b/versions/a-/akali.json index 82a641a9c4..4d9c7e16a0 100644 --- a/versions/a-/akali.json +++ b/versions/a-/akali.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0090858a22905c2856b8796f852d1a403081be7", + "version": "1.43", + "port-version": 1 + }, { "git-tree": "5e97f0348cd1def4c594fda413436a01609923ec", "version": "1.43", diff --git a/versions/baseline.json b/versions/baseline.json index fba437d9de..e49220b9af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -38,7 +38,7 @@ }, "akali": { "baseline": "1.43", - "port-version": 0 + "port-version": 1 }, "alac": { "baseline": "2017-11-03-c38887c5",