From f93f799b0a073d0195163ff528af1e25f295c2cd Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 25 Sep 2021 12:56:18 +0200 Subject: [PATCH 01/10] Update promise-cpp to 1.0.3 --- ports/promise-cpp/portfile.cmake | 17 +++++++++++++++++ ports/promise-cpp/vcpkg.json | 16 ++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 ports/promise-cpp/portfile.cmake create mode 100644 ports/promise-cpp/vcpkg.json diff --git a/ports/promise-cpp/portfile.cmake b/ports/promise-cpp/portfile.cmake new file mode 100644 index 00000000000000..2806d81e3f2333 --- /dev/null +++ b/ports/promise-cpp/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xhawk18/promise-cpp + SHA512 1.0.3 + SHA512 B0EF04C2B63BDD7E3061ED6E80C17FFE20042E285123D6B4A86AA517AB3D920050FD7B0563145531B001289D2165B6AF1B65C5BBF368001DEF1CF59AFCB9C330 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/promise-cpp RENAME copyright) diff --git a/ports/promise-cpp/vcpkg.json b/ports/promise-cpp/vcpkg.json new file mode 100644 index 00000000000000..4be1ff2e678378 --- /dev/null +++ b/ports/promise-cpp/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "promise-cpp", + "version-string": "1.0.3", + "description": "C++ promise/A+ library in Javascript style.", + "homepage": "https://github.com/xhawk18/promise-cpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 9c4abe91f4b54fa6dbc3c067221652c67e7ffd00 Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 25 Sep 2021 12:56:19 +0200 Subject: [PATCH 02/10] Update CI baseline --- versions/baseline.json | 4 ++++ versions/p-/promise-cpp.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/p-/promise-cpp.json diff --git a/versions/baseline.json b/versions/baseline.json index 1252bd05254d8e..311b0c5860b656 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5236,6 +5236,10 @@ "baseline": "0.13.0", "port-version": 0 }, + "promise-cpp": { + "baseline": "1.0.3", + "port-version": 0 + }, "protobuf": { "baseline": "3.18.0", "port-version": 0 diff --git a/versions/p-/promise-cpp.json b/versions/p-/promise-cpp.json new file mode 100644 index 00000000000000..1309c5516ac509 --- /dev/null +++ b/versions/p-/promise-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fbd1822f72da4ff1934d6395ddd918d68f9c0c0a", + "version-string": "1.0.3", + "port-version": 0 + } + ] +} From 4a55f0cad1731f9ff6e6a91127db411fea5a2894 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Sat, 25 Sep 2021 13:45:00 +0200 Subject: [PATCH 03/10] Fix portfile --- ports/promise-cpp/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/promise-cpp/portfile.cmake b/ports/promise-cpp/portfile.cmake index 2806d81e3f2333..10e745bd11ff94 100644 --- a/ports/promise-cpp/portfile.cmake +++ b/ports/promise-cpp/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xhawk18/promise-cpp - SHA512 1.0.3 + REF 1.0.3 SHA512 B0EF04C2B63BDD7E3061ED6E80C17FFE20042E285123D6B4A86AA517AB3D920050FD7B0563145531B001289D2165B6AF1B65C5BBF368001DEF1CF59AFCB9C330 HEAD_REF master ) From 768d585e3a069cea3948083af55cf0613f78395f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Sat, 25 Sep 2021 13:46:22 +0200 Subject: [PATCH 04/10] Update git-tree hash --- versions/p-/promise-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/promise-cpp.json b/versions/p-/promise-cpp.json index 1309c5516ac509..97509c49a6a28b 100644 --- a/versions/p-/promise-cpp.json +++ b/versions/p-/promise-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fbd1822f72da4ff1934d6395ddd918d68f9c0c0a", + "git-tree": "ef3fb5249eed37360ceb9b3b366037ad2ed2c865", "version-string": "1.0.3", "port-version": 0 } From b482928e08e70e6ba7e7dc32c4b761d88ee0479f Mon Sep 17 00:00:00 2001 From: chausner Date: Sun, 26 Sep 2021 19:14:54 +0200 Subject: [PATCH 05/10] Update to version 2.1.0 --- ports/promise-cpp/portfile.cmake | 15 +++++---------- ports/promise-cpp/vcpkg.json | 6 +----- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/ports/promise-cpp/portfile.cmake b/ports/promise-cpp/portfile.cmake index 10e745bd11ff94..d9246feb036470 100644 --- a/ports/promise-cpp/portfile.cmake +++ b/ports/promise-cpp/portfile.cmake @@ -1,17 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xhawk18/promise-cpp - REF 1.0.3 - SHA512 B0EF04C2B63BDD7E3061ED6E80C17FFE20042E285123D6B4A86AA517AB3D920050FD7B0563145531B001289D2165B6AF1B65C5BBF368001DEF1CF59AFCB9C330 + REF 2.1.0 + SHA512 34177f1d3615c460e8ffa1bfb69347cfbaf8c970e0482a73b1b568e0f058d69f2fa111aebebb6407dfc21578c95235d7524f9cc9ac92f7dcd5c614f17d0797bb HEAD_REF master ) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(GLOB PROMISE_HEADERS "${SOURCE_PATH}/include/*.hpp") +file(INSTALL ${PROMISE_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/promise-cpp RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/promise-cpp" RENAME copyright) diff --git a/ports/promise-cpp/vcpkg.json b/ports/promise-cpp/vcpkg.json index 4be1ff2e678378..d375e15ffce228 100644 --- a/ports/promise-cpp/vcpkg.json +++ b/ports/promise-cpp/vcpkg.json @@ -1,16 +1,12 @@ { "name": "promise-cpp", - "version-string": "1.0.3", + "version": "2.1.0", "description": "C++ promise/A+ library in Javascript style.", "homepage": "https://github.com/xhawk18/promise-cpp", "dependencies": [ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } From bed8b72803ecffa345af02e922e1788fccecad26 Mon Sep 17 00:00:00 2001 From: chausner Date: Sun, 26 Sep 2021 19:17:10 +0200 Subject: [PATCH 06/10] Update CI baseline and git-tree hash --- versions/baseline.json | 2 +- versions/p-/promise-cpp.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 311b0c5860b656..c607339c5d4545 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5237,7 +5237,7 @@ "port-version": 0 }, "promise-cpp": { - "baseline": "1.0.3", + "baseline": "2.1.0", "port-version": 0 }, "protobuf": { diff --git a/versions/p-/promise-cpp.json b/versions/p-/promise-cpp.json index 97509c49a6a28b..3c87c0499d9498 100644 --- a/versions/p-/promise-cpp.json +++ b/versions/p-/promise-cpp.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "ef3fb5249eed37360ceb9b3b366037ad2ed2c865", - "version-string": "1.0.3", + "git-tree": "bf5c220e7ba2589265ae699a23d31d5434d0bf80", + "version": "2.1.0", "port-version": 0 } ] From 3ac1c6720b7c2e2378f2f91e6addb194e8c4ed73 Mon Sep 17 00:00:00 2001 From: chausner Date: Sun, 26 Sep 2021 19:57:05 +0200 Subject: [PATCH 07/10] Add usage --- ports/promise-cpp/portfile.cmake | 3 ++- ports/promise-cpp/usage | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 ports/promise-cpp/usage diff --git a/ports/promise-cpp/portfile.cmake b/ports/promise-cpp/portfile.cmake index d9246feb036470..1b22456506d40a 100644 --- a/ports/promise-cpp/portfile.cmake +++ b/ports/promise-cpp/portfile.cmake @@ -9,4 +9,5 @@ vcpkg_from_github( file(GLOB PROMISE_HEADERS "${SOURCE_PATH}/include/*.hpp") file(INSTALL ${PROMISE_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/promise-cpp" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/promise-cpp/usage b/ports/promise-cpp/usage new file mode 100644 index 00000000000000..d36eddf05bdef9 --- /dev/null +++ b/ports/promise-cpp/usage @@ -0,0 +1,4 @@ +The package promise-cpp is header only and can be used from CMake via: + +find_path(PROMISE_CPP_INCLUDE_DIRS "promise.hpp") +target_include_directories(main PRIVATE ${PROMISE_CPP_INCLUDE_DIRS}) \ No newline at end of file From 68039754616e6d7a9ab2c0f3028be9c9c364ce89 Mon Sep 17 00:00:00 2001 From: chausner Date: Sun, 26 Sep 2021 19:57:26 +0200 Subject: [PATCH 08/10] Update git-tree hash --- versions/p-/promise-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/promise-cpp.json b/versions/p-/promise-cpp.json index 3c87c0499d9498..562310b4d17f0d 100644 --- a/versions/p-/promise-cpp.json +++ b/versions/p-/promise-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bf5c220e7ba2589265ae699a23d31d5434d0bf80", + "git-tree": "3bbcc8d70a090cadf3316eff5ca7ca48d597e785", "version": "2.1.0", "port-version": 0 } From 6edf8d27dc1d84aa138dbdfed47003f86afcecb8 Mon Sep 17 00:00:00 2001 From: chausner Date: Wed, 29 Sep 2021 20:01:29 +0200 Subject: [PATCH 09/10] Update to promise-cpp 2.1.2 --- ports/promise-cpp/fix-ifdef.patch | 12 ++++++++++++ ports/promise-cpp/portfile.cmake | 8 +++++--- ports/promise-cpp/usage | 9 +++++++-- ports/promise-cpp/vcpkg.json | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 ports/promise-cpp/fix-ifdef.patch diff --git a/ports/promise-cpp/fix-ifdef.patch b/ports/promise-cpp/fix-ifdef.patch new file mode 100644 index 00000000000000..8d818b3abe12cf --- /dev/null +++ b/ports/promise-cpp/fix-ifdef.patch @@ -0,0 +1,12 @@ +diff --git a/include/promise-cpp/promise.hpp b/include/promise-cpp/promise.hpp +--- a/include/promise-cpp/promise.hpp ++++ b/include/promise-cpp/promise.hpp +@@ -2,7 +2,7 @@ + #ifndef INC_PROMISE_HPP_ + #define INC_PROMISE_HPP_ + +-#ifdef PROMISE_HEADER_ONLY ++#ifdef PROMISE_HEADONLY + #define PROMISE_API inline + #elif defined PROMISE_BUILD_SHARED + diff --git a/ports/promise-cpp/portfile.cmake b/ports/promise-cpp/portfile.cmake index 1b22456506d40a..ed49e05269c9ee 100644 --- a/ports/promise-cpp/portfile.cmake +++ b/ports/promise-cpp/portfile.cmake @@ -1,13 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xhawk18/promise-cpp - REF 2.1.0 - SHA512 34177f1d3615c460e8ffa1bfb69347cfbaf8c970e0482a73b1b568e0f058d69f2fa111aebebb6407dfc21578c95235d7524f9cc9ac92f7dcd5c614f17d0797bb + REF 2.1.2 + SHA512 490571e6d6742e05ae6a2549af4e242a1d7084edc583fbbb183798bdddb25d08a7f68becfa94f55b877cba7e2e8e8515964f892881591b5bb394b4b33e6593f7 HEAD_REF master + PATCHES fix-ifdef.patch ) file(GLOB PROMISE_HEADERS "${SOURCE_PATH}/include/*.hpp") -file(INSTALL ${PROMISE_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/include/promise-cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/promise-cpp/usage b/ports/promise-cpp/usage index d36eddf05bdef9..0e9d486369365d 100644 --- a/ports/promise-cpp/usage +++ b/ports/promise-cpp/usage @@ -1,4 +1,9 @@ The package promise-cpp is header only and can be used from CMake via: -find_path(PROMISE_CPP_INCLUDE_DIRS "promise.hpp") -target_include_directories(main PRIVATE ${PROMISE_CPP_INCLUDE_DIRS}) \ No newline at end of file + find_path(PROMISE_CPP_INCLUDE_DIRS "promise-cpp/promise.hpp") + target_include_directories(main PRIVATE ${PROMISE_CPP_INCLUDE_DIRS}) + +Make sure to define the pre-processor macro PROMISE_HEADONLY before including "promise-cpp/promise.hpp": + + #define PROMISE_HEADONLY + #include "promise-cpp/promise.hpp" \ No newline at end of file diff --git a/ports/promise-cpp/vcpkg.json b/ports/promise-cpp/vcpkg.json index d375e15ffce228..3e6b7976def43d 100644 --- a/ports/promise-cpp/vcpkg.json +++ b/ports/promise-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "promise-cpp", - "version": "2.1.0", + "version": "2.1.2", "description": "C++ promise/A+ library in Javascript style.", "homepage": "https://github.com/xhawk18/promise-cpp", "dependencies": [ From 0ac24d105b92500867229e3e1cdde762abb7ca19 Mon Sep 17 00:00:00 2001 From: chausner Date: Wed, 29 Sep 2021 20:02:50 +0200 Subject: [PATCH 10/10] Update git-tree hash --- versions/baseline.json | 2 +- versions/p-/promise-cpp.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index c607339c5d4545..fb8b2b99b125cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5237,7 +5237,7 @@ "port-version": 0 }, "promise-cpp": { - "baseline": "2.1.0", + "baseline": "2.1.2", "port-version": 0 }, "protobuf": { diff --git a/versions/p-/promise-cpp.json b/versions/p-/promise-cpp.json index 562310b4d17f0d..63ec6b263c10e3 100644 --- a/versions/p-/promise-cpp.json +++ b/versions/p-/promise-cpp.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "3bbcc8d70a090cadf3316eff5ca7ca48d597e785", - "version": "2.1.0", + "git-tree": "ebacf13f64f6bab1413ec0e45d16259c8cf78279", + "version": "2.1.2", "port-version": 0 } ]