From 21717c0209f6a4cde5216798e765a06c7f5f2ccc Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Wed, 29 Dec 2021 10:29:48 +0800 Subject: [PATCH 01/13] [new port] minio-cpp v0.0.1 --- ports/minio-cpp/portfile.cmake | 19 +++++++++++++++++++ ports/minio-cpp/vcpkg.json | 11 +++++++++++ 2 files changed, 30 insertions(+) create mode 100644 ports/minio-cpp/portfile.cmake create mode 100644 ports/minio-cpp/vcpkg.json diff --git a/ports/minio-cpp/portfile.cmake b/ports/minio-cpp/portfile.cmake new file mode 100644 index 00000000000000..a82a947d803564 --- /dev/null +++ b/ports/minio-cpp/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO minio/minio-cpp + REF 0847e56f31e13d32c924029d5ffaa865f8396462 + SHA512 47817c8acc92060afca5ebd7c9bc7c9a9e09a50046180d7d3d67993f207d295c90e491417702ebb1ab2b0a6e85a5fcc334054ce4f6d542cb42c3675b5aed1c3f + HEAD_REF main +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/minio-cpp/vcpkg.json b/ports/minio-cpp/vcpkg.json new file mode 100644 index 00000000000000..224f61036bdcb0 --- /dev/null +++ b/ports/minio-cpp/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "minio-cpp", + "version": "0.0.1", + "description": "MinIO C++ Client SDK for Amazon S3 Compatible Cloud Storage", + "supports": "!uwp", + "dependencies": [ + "curlpp", + "pugixml", + "openssl" + ] +} \ No newline at end of file From f61ed759a2422e6971c53a615e73d0d925010582 Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Wed, 29 Dec 2021 10:51:24 +0800 Subject: [PATCH 02/13] fix with vcpkg x-add-version --all --- ports/minio-cpp/vcpkg.json | 22 +++++++++++----------- versions/baseline.json | 4 ++++ versions/m-/minio-cpp.json | 9 +++++++++ 3 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 versions/m-/minio-cpp.json diff --git a/ports/minio-cpp/vcpkg.json b/ports/minio-cpp/vcpkg.json index 224f61036bdcb0..0d723ce0bc1244 100644 --- a/ports/minio-cpp/vcpkg.json +++ b/ports/minio-cpp/vcpkg.json @@ -1,11 +1,11 @@ -{ - "name": "minio-cpp", - "version": "0.0.1", - "description": "MinIO C++ Client SDK for Amazon S3 Compatible Cloud Storage", - "supports": "!uwp", - "dependencies": [ - "curlpp", - "pugixml", - "openssl" - ] -} \ No newline at end of file +{ + "name": "minio-cpp", + "version": "0.0.1", + "description": "MinIO C++ Client SDK for Amazon S3 Compatible Cloud Storage", + "supports": "!uwp", + "dependencies": [ + "curlpp", + "openssl", + "pugixml" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1e3ee57d0aa017..54d590e17c2528 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4412,6 +4412,10 @@ "baseline": "2020-12-25", "port-version": 1 }, + "minio-cpp": { + "baseline": "0.0.1", + "port-version": 0 + }, "minisat-master-keying": { "baseline": "2.3.6", "port-version": 0 diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json new file mode 100644 index 00000000000000..61407f344776b3 --- /dev/null +++ b/versions/m-/minio-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6a72a9c2db2557a20725ffbe5f42ca2ced191273", + "version": "0.0.1", + "port-version": 0 + } + ] +} From b147d962f7a5240e74fa77a80181778080a75a34 Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Wed, 29 Dec 2021 10:58:02 +0800 Subject: [PATCH 03/13] Update version database --- versions/m-/minio-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json index 61407f344776b3..4f91627baee162 100644 --- a/versions/m-/minio-cpp.json +++ b/versions/m-/minio-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6a72a9c2db2557a20725ffbe5f42ca2ced191273", + "git-tree": "7d74416b54978684e3e93a8fc3e1a3eab0351e61", "version": "0.0.1", "port-version": 0 } From 08189e852ef5e1e8de9d731989c708866530e6bf Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Wed, 29 Dec 2021 13:19:59 +0800 Subject: [PATCH 04/13] fix deprecated functions --- ports/minio-cpp/portfile.cmake | 4 ++-- ports/minio-cpp/vcpkg.json | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/minio-cpp/portfile.cmake b/ports/minio-cpp/portfile.cmake index a82a947d803564..a4e7514b877cca 100644 --- a/ports/minio-cpp/portfile.cmake +++ b/ports/minio-cpp/portfile.cmake @@ -6,13 +6,13 @@ vcpkg_from_github( HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/minio-cpp/vcpkg.json b/ports/minio-cpp/vcpkg.json index 0d723ce0bc1244..4f95d37adbedb2 100644 --- a/ports/minio-cpp/vcpkg.json +++ b/ports/minio-cpp/vcpkg.json @@ -6,6 +6,14 @@ "dependencies": [ "curlpp", "openssl", - "pugixml" + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From e3754ef00c60e931b779de2e9b35f5aa5b04699d Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Wed, 29 Dec 2021 16:20:22 +0800 Subject: [PATCH 05/13] Update version database --- versions/m-/minio-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json index 4f91627baee162..8b56e0ae6eb7be 100644 --- a/versions/m-/minio-cpp.json +++ b/versions/m-/minio-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7d74416b54978684e3e93a8fc3e1a3eab0351e61", + "git-tree": "7bc2b0d04c8a8422d182bba9463691199e31ce8a", "version": "0.0.1", "port-version": 0 } From ead98fc0c67408173e41de95cfd23af2832b5e1b Mon Sep 17 00:00:00 2001 From: kkzi <34122458+kkzi@users.noreply.github.com> Date: Fri, 31 Dec 2021 10:35:22 +0800 Subject: [PATCH 06/13] Update ports/minio-cpp/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/minio-cpp/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/minio-cpp/portfile.cmake b/ports/minio-cpp/portfile.cmake index a4e7514b877cca..e7c916f7a00300 100644 --- a/ports/minio-cpp/portfile.cmake +++ b/ports/minio-cpp/portfile.cmake @@ -14,6 +14,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() - +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From e296a672f58b586b468f3b1bf4ea0ed48f781490 Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Fri, 31 Dec 2021 10:43:49 +0800 Subject: [PATCH 07/13] minio-cpp:x64-osx=fail --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c7f6083e377a8c..0d9a98f24d2554 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -843,6 +843,7 @@ minhook:x64-osx=fail minhook:x64-uwp=fail minifb:arm-uwp=fail minifb:x64-uwp=fail +minio-cpp:x64-osx=fail minisat-master-keying:arm-uwp=fail minisat-master-keying:x64-uwp=fail miniupnpc:arm-uwp=fail From 5dc6ba98e3e981d0822ce414582418a702c7b534 Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Fri, 31 Dec 2021 10:44:36 +0800 Subject: [PATCH 08/13] Update version database --- versions/m-/minio-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json index 8b56e0ae6eb7be..a60bf29456b7fc 100644 --- a/versions/m-/minio-cpp.json +++ b/versions/m-/minio-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7bc2b0d04c8a8422d182bba9463691199e31ce8a", + "git-tree": "57f8cd7ed90f516be64a43fb4f16276d2eb8a7b7", "version": "0.0.1", "port-version": 0 } From 540dd4e43689213a65ff33f61a2df28cf49d7759 Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Fri, 31 Dec 2021 11:01:58 +0800 Subject: [PATCH 09/13] add patch file --- ports/minio-cpp/fix_cmake_file.patch | 12 ++++++++++++ ports/minio-cpp/portfile.cmake | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 ports/minio-cpp/fix_cmake_file.patch diff --git a/ports/minio-cpp/fix_cmake_file.patch b/ports/minio-cpp/fix_cmake_file.patch new file mode 100644 index 00000000000000..fd6cf192c0f314 --- /dev/null +++ b/ports/minio-cpp/fix_cmake_file.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6df202c..98eeeb0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,6 +114,3 @@ else (DOXYGEN_FOUND) + message("Doxygen need to be installed to generate the doxygen documentation") + endif (DOXYGEN_FOUND) + +-configure_file(miniocpp.pc.in miniocpp.pc @ONLY) +-install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) +- + diff --git a/ports/minio-cpp/portfile.cmake b/ports/minio-cpp/portfile.cmake index e7c916f7a00300..1fe1394579d2f0 100644 --- a/ports/minio-cpp/portfile.cmake +++ b/ports/minio-cpp/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 0847e56f31e13d32c924029d5ffaa865f8396462 SHA512 47817c8acc92060afca5ebd7c9bc7c9a9e09a50046180d7d3d67993f207d295c90e491417702ebb1ab2b0a6e85a5fcc334054ce4f6d542cb42c3675b5aed1c3f HEAD_REF main + PATCHES + fix_cmake_file.patch ) vcpkg_cmake_configure( From 66f5579c62624de717207391a45a8a250ca35473 Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Fri, 31 Dec 2021 11:02:13 +0800 Subject: [PATCH 10/13] Update version database --- versions/m-/minio-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json index a60bf29456b7fc..e1fc0708285b6b 100644 --- a/versions/m-/minio-cpp.json +++ b/versions/m-/minio-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "57f8cd7ed90f516be64a43fb4f16276d2eb8a7b7", + "git-tree": "a71471fab2c087924710f6d2170bcaab508df674", "version": "0.0.1", "port-version": 0 } From 0508f4361b2aaf4c6ebdf79554bcf1ebf95da4c7 Mon Sep 17 00:00:00 2001 From: "xuan.guo@atomdatatech.com" Date: Mon, 3 Jan 2022 12:25:48 +0800 Subject: [PATCH 11/13] Revert "minio-cpp:x64-osx=fail" This reverts commit e296a672f58b586b468f3b1bf4ea0ed48f781490. --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0d9a98f24d2554..c7f6083e377a8c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -843,7 +843,6 @@ minhook:x64-osx=fail minhook:x64-uwp=fail minifb:arm-uwp=fail minifb:x64-uwp=fail -minio-cpp:x64-osx=fail minisat-master-keying:arm-uwp=fail minisat-master-keying:x64-uwp=fail miniupnpc:arm-uwp=fail From 74e91a64c0a1eae687fe5a02ee41e5bbcdbc12d8 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 4 Jan 2022 15:17:35 -0800 Subject: [PATCH 12/13] we still want to install pkgconfig file --- ports/minio-cpp/fix_cmake_file.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/minio-cpp/fix_cmake_file.patch b/ports/minio-cpp/fix_cmake_file.patch index fd6cf192c0f314..f4f6d95b417714 100644 --- a/ports/minio-cpp/fix_cmake_file.patch +++ b/ports/minio-cpp/fix_cmake_file.patch @@ -2,11 +2,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 6df202c..98eeeb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -114,6 +114,3 @@ else (DOXYGEN_FOUND) +@@ -114,6 +114,6 @@ else (DOXYGEN_FOUND) message("Doxygen need to be installed to generate the doxygen documentation") endif (DOXYGEN_FOUND) --configure_file(miniocpp.pc.in miniocpp.pc @ONLY) + configure_file(miniocpp.pc.in miniocpp.pc @ONLY) -install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) -- ++install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) From 660467d720510864c67fe0b31c122850ba7009e9 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 4 Jan 2022 15:19:55 -0800 Subject: [PATCH 13/13] fix version --- ports/minio-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/minio-cpp.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/minio-cpp/vcpkg.json b/ports/minio-cpp/vcpkg.json index 4f95d37adbedb2..ce272682456c7d 100644 --- a/ports/minio-cpp/vcpkg.json +++ b/ports/minio-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "minio-cpp", - "version": "0.0.1", + "version-date": "2022-01-03", "description": "MinIO C++ Client SDK for Amazon S3 Compatible Cloud Storage", "supports": "!uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 54d590e17c2528..bc7889398933bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4413,7 +4413,7 @@ "port-version": 1 }, "minio-cpp": { - "baseline": "0.0.1", + "baseline": "2022-01-03", "port-version": 0 }, "minisat-master-keying": { diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json index e1fc0708285b6b..66dde1213cdbc1 100644 --- a/versions/m-/minio-cpp.json +++ b/versions/m-/minio-cpp.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "a71471fab2c087924710f6d2170bcaab508df674", - "version": "0.0.1", + "git-tree": "0b0fe1b9353fd016b3f2e3212ae30a7a82b71ceb", + "version-date": "2022-01-03", "port-version": 0 } ]