From ca8dee143c852e9701fe5af58e0b558f83245f69 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Wed, 27 Nov 2024 09:08:20 -0500 Subject: [PATCH] Updating the necesary files. --- ports/discordcoreapi/portfile.cmake | 17 ++--------------- ports/discordcoreapi/vcpkg.json | 3 +-- ports/jsonifier/portfile.cmake | 6 ++---- ports/jsonifier/vcpkg.json | 3 +-- versions/baseline.json | 8 ++++---- versions/d-/discordcoreapi.json | 5 +++++ versions/j-/jsonifier.json | 5 +++++ 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index d17a4211568c0c..4b580a4566cf5b 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,25 +6,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 344e960491e17e9626f6ab4a42f28fe59842c0c15cf32ef2508e850099105667c651feaa6dd642207413fbeac43283310fe2b9a98a2ebfd4a49716da43e5cade + SHA512 89878716432457bea78e5fc6c29f223f78a733897993596db278fd32afd45b31b0b665f478cb80938527da9325d5afa964d52ea405d1c4be46c79ed690038790 HEAD_REF main ) -# discordcoreapi consumes extreme amounts of memory (>9GB per .cpp file). With our default -# concurrency values this causes hanging and/or OOM killing on Linux build machines and -# warnings on the Windows machines like: -# #[warning]Free memory is lower than 5%; Currently used: 99.99% -# #[warning]Free memory is lower than 5%; Currently used: 99.99% -# #[warning]Free memory is lower than 5%; Currently used: 99.99% -# Cut the requested concurrency in quarter to avoid this. -if(VCPKG_CONCURRENCY GREATER 4) - math(EXPR VCPKG_CONCURRENCY "${VCPKG_CONCURRENCY} / 4") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - # Due to CMake/DCADetectArchitecture.cmake invoking a sub-CMake and using the source tree as the target - DISABLE_PARALLEL_CONFIGURE ) vcpkg_cmake_install() @@ -37,4 +24,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md") \ No newline at end of file diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 3417fc992a5d2e..f15ce5e973c013 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "discordcoreapi", - "version": "2.0.7", - "port-version": 1, + "version": "2.0.8", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "MIT", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 79b10828fc11a3..136cb59da385ed 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier - REF "v${VERSION}" - SHA512 6168378a117850297fcda78853a0babd0ce7e0ca21b3e8c276acb7e75e04d85ed8909061a62e3324c309fe9e31bc59d89ea06e47853b50481843273e95172ab8 + REF "v${VERSION}" + SHA512 0e08b5114a09f3e5cf41d245358baadecdd1559deba16a71dbb5a953882d9fc07587e7b27b4fbcbf810f8b2554c6afa1038b24447da51ea266b2557ff0d7a0d2 HEAD_REF main ) @@ -10,8 +10,6 @@ set(VCPKG_BUILD_TYPE release) # header-only vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - # Due to CMake/JsonifierDetectArchitecture.cmake invoking a sub-CMake and using the source tree as the target - DISABLE_PARALLEL_CONFIGURE ) vcpkg_cmake_install() diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index da80b4e090beb5..1d9196252acfb9 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,7 +1,6 @@ { "name": "jsonifier", - "version": "0.9.97", - "port-version": 1, + "version": "0.9.98", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4ec7800ee4bf7d..b96eea479a8971 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2357,8 +2357,8 @@ "port-version": 4 }, "discordcoreapi": { - "baseline": "2.0.7", - "port-version": 1 + "baseline": "2.0.8", + "port-version": 0 }, "discount": { "baseline": "3.0.0d", @@ -3909,8 +3909,8 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.97", - "port-version": 1 + "baseline": "0.9.98", + "port-version": 0 }, "jsonnet": { "baseline": "0.20.0", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 9902de2ffd164b..b8c542bf755406 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f2280e860aebd74f106d91872ce53ea4d51b8bf", + "version": "2.0.8", + "port-version": 0 + }, { "git-tree": "1371e3f72145af807a144e3fadb1daf58c0b7cdd", "version": "2.0.7", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index af011007e68a51..820e8e3c215e5a 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a92efb571bd140596c506b01163c36bf89b1c95a", + "version": "0.9.98", + "port-version": 0 + }, { "git-tree": "5d654c9f844e2a31fdefed0d5e628d241e6451f6", "version": "0.9.97",