From 50a51751084c61d71e6b25b35242efd5cfc35199 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 26 Jul 2024 09:17:21 +0200 Subject: [PATCH 1/8] =?UTF-8?q?[rmqcpp]=20Update=20to=20latest=20revision?= =?UTF-8?q?=20=E2=80=94=20Fixes=20#38736?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ports/rmqcpp/portfile.cmake | 4 ++-- ports/rmqcpp/vcpkg.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/rmqcpp/portfile.cmake b/ports/rmqcpp/portfile.cmake index 2e8b3e4c711812..773bfae8a0761b 100644 --- a/ports/rmqcpp/portfile.cmake +++ b/ports/rmqcpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bloomberg/rmqcpp - REF 52e583c2eb3f06707ce5fde7f29089b17428f6b2 - SHA512 c4232f37e7bc61d0cc77c52a1283fefc1a7925b4ef8cfbe9b404393540c773feabdc2ad3adc263beb06fe079cbf22010bf1551e15eb2f55b1347f6d8c8f35f8b + REF 11859eb470f31008da522b59e96899585b4e94ce + SHA512 f82cc1696d370e81dc410442465ecbe06940cd50ae8c93215e19a4b7de57ee7581a1d4f59d9775e08c646b63496ac18528b29edb852e0b9fb9cab7f761151b25 HEAD_REF main ) diff --git a/ports/rmqcpp/vcpkg.json b/ports/rmqcpp/vcpkg.json index 3cf1f4f184a20d..17a25709cfb475 100644 --- a/ports/rmqcpp/vcpkg.json +++ b/ports/rmqcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rmqcpp", "version": "1.0.0", + "port-version": 1, "description": "rmqcpp - A C++ library for RabbitMQ.", "dependencies": [ { From dc8a58ddfd8f5d4a59d7784b79bd792f3f00f347 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 26 Jul 2024 09:23:19 +0200 Subject: [PATCH 2/8] [rmqcpp] Update version metadata to add 1.0.0#1 --- versions/baseline.json | 2 +- versions/r-/rmqcpp.json | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index b663961f815131..baf0ad132627fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7830,7 +7830,7 @@ }, "rmqcpp": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "roaring": { "baseline": "4.0.0", diff --git a/versions/r-/rmqcpp.json b/versions/r-/rmqcpp.json index 8b38d63717ccba..12bae82bf9ea35 100644 --- a/versions/r-/rmqcpp.json +++ b/versions/r-/rmqcpp.json @@ -1,9 +1,14 @@ { - "versions": [ - { - "version": "1.0.0", - "port-version": 0, - "git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602" - } - ] + "versions": [ + { + "git-tree": "b1535b9f073a806f1d9c4a7a5f45abc98c8796a1", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602", + "version": "1.0.0", + "port-version": 0 + } + ] } From 2565863bf6236b537941671ece0071398c21df35 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Sun, 28 Jul 2024 12:23:50 +0200 Subject: [PATCH 3/8] [rmqcpp] Remove `host: true` on dependencie where it doesn't make sense --- ports/rmqcpp/vcpkg.json | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/ports/rmqcpp/vcpkg.json b/ports/rmqcpp/vcpkg.json index 17a25709cfb475..d3ae3ecc62050f 100644 --- a/ports/rmqcpp/vcpkg.json +++ b/ports/rmqcpp/vcpkg.json @@ -6,25 +6,12 @@ "dependencies": [ { "name": "bde", - "host": true, "version>=": "3.123.0.0" }, - { - "name": "boost-asio", - "host": true - }, - { - "name": "boost-iostreams", - "host": true - }, - { - "name": "gtest", - "host": true - }, - { - "name": "openssl", - "host": true - }, + "boost-asio", + "boost-iostreams", + "gtest", + "openssl", { "name": "vcpkg-cmake", "host": true From a80fce0e49265a3a0fcafa7c4d15094ef6b1054f Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Sun, 28 Jul 2024 12:29:56 +0200 Subject: [PATCH 4/8] [rmqcpp] Update baseline `git-tree` --- versions/r-/rmqcpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/r-/rmqcpp.json b/versions/r-/rmqcpp.json index 12bae82bf9ea35..34906a0d0a2a90 100644 --- a/versions/r-/rmqcpp.json +++ b/versions/r-/rmqcpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b1535b9f073a806f1d9c4a7a5f45abc98c8796a1", + "git-tree": "92a6b0e1614463ee3d221a284635584622df5cea", "version": "1.0.0", "port-version": 1 }, From 36e9884068b9383e89c25db06566297675daa5eb Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Thu, 8 Aug 2024 12:21:33 +0200 Subject: [PATCH 5/8] [rmqcpp] Add patch to skip building examples and tests --- ports/rmqcpp/disable-tests-and-examples.patch | 22 +++++++++++++++++++ ports/rmqcpp/portfile.cmake | 2 ++ ports/rmqcpp/vcpkg.json | 1 - 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ports/rmqcpp/disable-tests-and-examples.patch diff --git a/ports/rmqcpp/disable-tests-and-examples.patch b/ports/rmqcpp/disable-tests-and-examples.patch new file mode 100644 index 00000000000000..7986ea67256bb1 --- /dev/null +++ b/ports/rmqcpp/disable-tests-and-examples.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33db7ca..41ffd06 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,6 @@ enable_testing() + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + + add_subdirectory(src) +-add_subdirectory(examples) + + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + add_compile_options(-Wall -Wextra -Wpedantic) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f051820..2db9e2a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -9,5 +9,3 @@ find_package(GTest REQUIRED) + find_package(bal REQUIRED) + + add_subdirectory(rmq) +-add_subdirectory(rmqtestmocks) +-add_subdirectory(tests) diff --git a/ports/rmqcpp/portfile.cmake b/ports/rmqcpp/portfile.cmake index 773bfae8a0761b..308aef6e0d21e8 100644 --- a/ports/rmqcpp/portfile.cmake +++ b/ports/rmqcpp/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 11859eb470f31008da522b59e96899585b4e94ce SHA512 f82cc1696d370e81dc410442465ecbe06940cd50ae8c93215e19a4b7de57ee7581a1d4f59d9775e08c646b63496ac18528b29edb852e0b9fb9cab7f761151b25 HEAD_REF main + PATCHES + "disable-tests-and-examples.patch" ) vcpkg_cmake_configure( diff --git a/ports/rmqcpp/vcpkg.json b/ports/rmqcpp/vcpkg.json index d3ae3ecc62050f..565bcb2a846c70 100644 --- a/ports/rmqcpp/vcpkg.json +++ b/ports/rmqcpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rmqcpp", "version": "1.0.0", - "port-version": 1, "description": "rmqcpp - A C++ library for RabbitMQ.", "dependencies": [ { From 5293891d44f307aab80c2db158e0e72aa906c74c Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 9 Aug 2024 20:59:07 +0200 Subject: [PATCH 6/8] [rmqcpp] Update baseline and versions file --- versions/baseline.json | 2 +- versions/r-/rmqcpp.json | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index baf0ad132627fb..b663961f815131 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7830,7 +7830,7 @@ }, "rmqcpp": { "baseline": "1.0.0", - "port-version": 1 + "port-version": 0 }, "roaring": { "baseline": "4.0.0", diff --git a/versions/r-/rmqcpp.json b/versions/r-/rmqcpp.json index 34906a0d0a2a90..7c86cab3a66cc3 100644 --- a/versions/r-/rmqcpp.json +++ b/versions/r-/rmqcpp.json @@ -1,12 +1,7 @@ { "versions": [ { - "git-tree": "92a6b0e1614463ee3d221a284635584622df5cea", - "version": "1.0.0", - "port-version": 1 - }, - { - "git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602", + "git-tree": "8e72c439e2946b635b9a9269e82528336c4a8ce8", "version": "1.0.0", "port-version": 0 } From 46315b4f540bb717da6cd95d2188f8c98f803108 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Wed, 4 Sep 2024 15:49:34 +0800 Subject: [PATCH 7/8] revert and add port-verison --- ports/rmqcpp/vcpkg.json | 1 + versions/r-/rmqcpp.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ports/rmqcpp/vcpkg.json b/ports/rmqcpp/vcpkg.json index 565bcb2a846c70..d3ae3ecc62050f 100644 --- a/ports/rmqcpp/vcpkg.json +++ b/ports/rmqcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rmqcpp", "version": "1.0.0", + "port-version": 1, "description": "rmqcpp - A C++ library for RabbitMQ.", "dependencies": [ { diff --git a/versions/r-/rmqcpp.json b/versions/r-/rmqcpp.json index 7c86cab3a66cc3..ad0c9053114916 100644 --- a/versions/r-/rmqcpp.json +++ b/versions/r-/rmqcpp.json @@ -1,9 +1,9 @@ { - "versions": [ - { - "git-tree": "8e72c439e2946b635b9a9269e82528336c4a8ce8", - "version": "1.0.0", - "port-version": 0 - } - ] -} + "versions": [ + { + "version": "1.0.0", + "port-version": 0, + "git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602" + } + ] +} \ No newline at end of file From 6a6a0bec2c2852a71c89c305507b28e8f1807794 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Wed, 4 Sep 2024 15:49:55 +0800 Subject: [PATCH 8/8] update version --- versions/baseline.json | 2 +- versions/r-/rmqcpp.json | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index b663961f815131..baf0ad132627fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7830,7 +7830,7 @@ }, "rmqcpp": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "roaring": { "baseline": "4.0.0", diff --git a/versions/r-/rmqcpp.json b/versions/r-/rmqcpp.json index ad0c9053114916..326fee419f2b08 100644 --- a/versions/r-/rmqcpp.json +++ b/versions/r-/rmqcpp.json @@ -1,9 +1,14 @@ { - "versions": [ - { - "version": "1.0.0", - "port-version": 0, - "git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602" - } - ] -} \ No newline at end of file + "versions": [ + { + "git-tree": "5671a6b2d1b566222dbe12642e6e4fd86c9cc7f5", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602", + "version": "1.0.0", + "port-version": 0 + } + ] +}