From e80f345d8e23e0c759148464773caef0fc2388e6 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Thu, 12 May 2022 07:47:22 +0800 Subject: [PATCH] [akali] Update to v1.43 (#24648) * [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 Co-authored-by: FrankXie --- ports/akali/portfile.cmake | 32 ++++++++++++++++---------------- ports/akali/vcpkg.json | 16 +++++++++++++--- versions/a-/akali.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 4c6a52472b..f489f6e263 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,40 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF 57fea619dea42aa116679b22340f56fc94eb83a9 - SHA512 b80f7e72396032e8b24464e159f4a6c24663d671bcbe9ffa46f68e5bc0398fd0caf3ac918f8ccb8d304be4d5a3fade2821f87f7270e02ec8aae722e2faeab0f3 + REF 2e35164a9a2a48a50af06c8ae59fcad0f4d6584e + SHA512 103c4da3d318d7ae7da4821e58eced918c9d64dbc6d97e9e6c15fa69731331cf6160f593437366cb3a844fa292a8d875e3e63a679e7fbdeae22bb4d73e3d3144 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DAKALI_STATIC:BOOL=${AKALI_STATIC} -DBUILD_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/akali) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/akali) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/akali") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/akali) +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) +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}") else() string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h "${AKALI_EXPORT_H}") +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_copy_pdbs() diff --git a/ports/akali/vcpkg.json b/ports/akali/vcpkg.json index 1977d5a26f..aa2f9c420e 100644 --- a/ports/akali/vcpkg.json +++ b/ports/akali/vcpkg.json @@ -1,8 +1,18 @@ { "name": "akali", - "version-string": "1.42", - "port-version": 3, + "version": "1.43", "description": "C++ Common Library.", "homepage": "https://github.com/winsoft666/akali", - "supports": "!(arm | arm64 | uwp)" + "license": "MIT", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/akali.json b/versions/a-/akali.json index 210ecf510b..82a641a9c4 100644 --- a/versions/a-/akali.json +++ b/versions/a-/akali.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e97f0348cd1def4c594fda413436a01609923ec", + "version": "1.43", + "port-version": 0 + }, { "git-tree": "44ab167f077406e598eb19f7e48f10b638bc1547", "version-string": "1.42", diff --git a/versions/baseline.json b/versions/baseline.json index 1903c79c0d..a46fc05461 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -37,8 +37,8 @@ "port-version": 1 }, "akali": { - "baseline": "1.42", - "port-version": 3 + "baseline": "1.43", + "port-version": 0 }, "alac": { "baseline": "2017-11-03-c38887c5",