From 8ca5fff52670deefdb4a8a0b2a47852dd689c272 Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Mon, 8 Nov 2021 13:46:08 -0500 Subject: [PATCH 1/3] [2.4.3] Add launch-darkly-server port --- ports/launch-darkly-server/portfile.cmake | 36 +++++++++++++++++++++++ ports/launch-darkly-server/vcpkg.json | 19 ++++++++++++ versions/baseline.json | 4 +++ versions/l-/launch-darkly-server.json | 9 ++++++ 4 files changed, 68 insertions(+) create mode 100644 ports/launch-darkly-server/portfile.cmake create mode 100644 ports/launch-darkly-server/vcpkg.json create mode 100644 versions/l-/launch-darkly-server.json diff --git a/ports/launch-darkly-server/portfile.cmake b/ports/launch-darkly-server/portfile.cmake new file mode 100644 index 00000000000000..d3eaef0aab6bf2 --- /dev/null +++ b/ports/launch-darkly-server/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO launchdarkly/c-server-sdk + REF 0d9db81862e1b17426da9b433a19376dd6458937 # 2.4.3 + SHA512 1bbafd212b0a271909a03319954ee2c92a3dde713fe7f9e0fdd79a5f011f0775701060b66ae9b3a4efad59376241b893d4b3d6679743c41e7657c355c7e3df5c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ldserverapi.dll" "${CURRENT_PACKAGES_DIR}/bin/ldserverapi.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ldserverapi.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/ldserverapi.dll") + endif() +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/launch-darkly-server" + "${CURRENT_PACKAGES_DIR}/lib/launch-darkly-server" + ) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/launch-darkly-server/vcpkg.json b/ports/launch-darkly-server/vcpkg.json new file mode 100644 index 00000000000000..680d9ce9820a3e --- /dev/null +++ b/ports/launch-darkly-server/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "launch-darkly-server", + "version": "2.4.3", + "description": "LaunchDarkly server-side SDK for C/C++", + "homepage": "https://github.com/launchdarkly/c-server-sdk", + "supports": "!uwp & !arm", + "dependencies": [ + "curl", + "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5307c8cc285464..692d8b55fc1941 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3128,6 +3128,10 @@ "baseline": "3.4.3", "port-version": 1 }, + "launch-darkly-server": { + "baseline": "2.4.3", + "port-version": 0 + }, "lazy-importer": { "baseline": "2019-08-10", "port-version": 1 diff --git a/versions/l-/launch-darkly-server.json b/versions/l-/launch-darkly-server.json new file mode 100644 index 00000000000000..ecfd5cdf2a716a --- /dev/null +++ b/versions/l-/launch-darkly-server.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d0ae10ccccd8d4aafe11159410488823ab14205d", + "version": "2.4.3", + "port-version": 0 + } + ] +} From c4b95d2ff550f297e2505467a3884d4c045d3598 Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Tue, 9 Nov 2021 09:54:47 -0500 Subject: [PATCH 2/3] Review portfile --- ports/launch-darkly-server/portfile.cmake | 4 ---- versions/l-/launch-darkly-server.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/launch-darkly-server/portfile.cmake b/ports/launch-darkly-server/portfile.cmake index d3eaef0aab6bf2..1c90c41a4b0662 100644 --- a/ports/launch-darkly-server/portfile.cmake +++ b/ports/launch-darkly-server/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO launchdarkly/c-server-sdk @@ -26,8 +24,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/launch-darkly-server" - "${CURRENT_PACKAGES_DIR}/lib/launch-darkly-server" ) vcpkg_copy_pdbs() diff --git a/versions/l-/launch-darkly-server.json b/versions/l-/launch-darkly-server.json index ecfd5cdf2a716a..13d897bcbbf9f5 100644 --- a/versions/l-/launch-darkly-server.json +++ b/versions/l-/launch-darkly-server.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d0ae10ccccd8d4aafe11159410488823ab14205d", + "git-tree": "f28ca7eb6ae669ce6cf2e3f4d43cb97d64d90077", "version": "2.4.3", "port-version": 0 } From 60f6da732ada7e4de33a204daae5e34fbdd9f50b Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Wed, 10 Nov 2021 08:55:47 -0500 Subject: [PATCH 3/3] Skip database tests. --- ports/launch-darkly-server/portfile.cmake | 1 + versions/l-/launch-darkly-server.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/launch-darkly-server/portfile.cmake b/ports/launch-darkly-server/portfile.cmake index 1c90c41a4b0662..f16ab0424308ac 100644 --- a/ports/launch-darkly-server/portfile.cmake +++ b/ports/launch-darkly-server/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DBUILD_TESTING=OFF" + "-DSKIP_DATABASE_TESTS=OFF" ) vcpkg_cmake_install() diff --git a/versions/l-/launch-darkly-server.json b/versions/l-/launch-darkly-server.json index 13d897bcbbf9f5..df236e72947924 100644 --- a/versions/l-/launch-darkly-server.json +++ b/versions/l-/launch-darkly-server.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "f28ca7eb6ae669ce6cf2e3f4d43cb97d64d90077", + "git-tree": "79ea5536dae8c4031640373d54bdef7d0e746483", "version": "2.4.3", "port-version": 0 } ] -} +} \ No newline at end of file