From 9059fdb08593989e9f382e8b90e3b2d068aa17c4 Mon Sep 17 00:00:00 2001 From: CCP ChargeBack <35330827+ccp-chargeback@users.noreply.github.com> Date: Tue, 11 Nov 2025 15:52:08 +0000 Subject: [PATCH 1/5] Update carbonengine vcpkg-registry baseline --- vcpkg-configuration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 9c0fca4..6e94d8f 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -8,7 +8,7 @@ { "kind": "git", "repository": "git@github.com:carbonengine/vcpkg-registry.git", - "baseline": "addd8867a1553f4b7866bb7a36deb84bd59bd1f9", + "baseline": "318bb80ae975f20226d3e031eb9c70804fb717aa", "packages": ["carbon-*", "python3", "bsdiff-drake127"] } ] From c419396acacd0163136bfd103f5a2f80037b43b5 Mon Sep 17 00:00:00 2001 From: CCP ChargeBack <35330827+ccp-chargeback@users.noreply.github.com> Date: Tue, 11 Nov 2025 16:07:24 +0000 Subject: [PATCH 2/5] Re-organize vcpkg.json file - Dependencies in alphabetical order --- vcpkg.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index bb2353a..693a64a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -5,13 +5,17 @@ "version>=": "2.2#0" }, { - "name": "curl", - "version>=": "8.11.1#1" + "name": "bsdiff-drake127", + "version>=": "4.3.3" }, { "name": "cryptopp", "version>=": "8.9.0#1" }, + { + "name": "curl", + "version>=": "8.11.1#1" + }, { "name": "yaml-cpp", "version>=": "0.8.0#1" @@ -19,38 +23,34 @@ { "name": "zlib", "version>=": "1.3.1" - }, - { - "name": "bsdiff-drake127", - "version>=": "4.3.3" } ], "default-features": [ "tests" ], "features": { + "docs": { + "description": "Generate documentation", + "dependencies": [ + { + "name": "python3", + "host": true, + "version>=": "3.12.3" + } + ] + }, "tests": { "description": "Enable tests", "dependencies": [ { "name": "gtest", - "version>=": "1.15.2", - "host": true + "host": true, + "version>=": "1.15.2" }, { "name": "tiny-process-library", - "version>=": "2.0.4#3", - "host": true - } - ] - }, - "docs": { - "description": "Generate documentation", - "dependencies": [ - { - "name": "python3", - "version>=": "3.12.3", - "host": true + "host": true, + "version>=": "2.0.4#3" } ] } From c005d9e23aab02d4b4ec34f8bbec74cb4a40a599 Mon Sep 17 00:00:00 2001 From: CCP ChargeBack <35330827+ccp-chargeback@users.noreply.github.com> Date: Tue, 11 Nov 2025 17:03:04 +0000 Subject: [PATCH 3/5] Use latest port version of bsdiff-drake and python3 --- vcpkg.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 693a64a..fee8d3f 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,11 +2,11 @@ "dependencies": [ { "name": "argparse", - "version>=": "2.2#0" + "version>=": "2.2" }, { "name": "bsdiff-drake127", - "version>=": "4.3.3" + "version>=": "4.3.3#1" }, { "name": "cryptopp", @@ -35,7 +35,7 @@ { "name": "python3", "host": true, - "version>=": "3.12.3" + "version>=": "3.12.3#1" } ] }, @@ -58,7 +58,7 @@ "overrides": [ { "name": "argparse", - "version": "2.2#0" + "version": "2.2" } ] } From b325ee78fa3f133eb371235a66aa8b1d9a262e5b Mon Sep 17 00:00:00 2001 From: CCP ChargeBack <35330827+ccp-chargeback@users.noreply.github.com> Date: Wed, 12 Nov 2025 11:04:38 +0000 Subject: [PATCH 4/5] Revert back to earlier baseline for carbonengine/vcpkg-registry --- vcpkg-configuration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 6e94d8f..9c0fca4 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -8,7 +8,7 @@ { "kind": "git", "repository": "git@github.com:carbonengine/vcpkg-registry.git", - "baseline": "318bb80ae975f20226d3e031eb9c70804fb717aa", + "baseline": "addd8867a1553f4b7866bb7a36deb84bd59bd1f9", "packages": ["carbon-*", "python3", "bsdiff-drake127"] } ] From 3b3462f5b6ae808b494423f1ab772352c0fa6e2e Mon Sep 17 00:00:00 2001 From: CCP ChargeBack <35330827+ccp-chargeback@users.noreply.github.com> Date: Wed, 12 Nov 2025 11:30:10 +0000 Subject: [PATCH 5/5] Update version info to 3.1.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 279281f..4ad8c19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.30.1) -project(resources VERSION 3.1.0) +project(resources VERSION 3.1.1) include(cmake/CcpGlobalSettings.cmake) include(cmake/CcpTargetConfigurations.cmake)