mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 08:35:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[discordcoreapi] install certs in correct location (#24031)

Browse Source
This commit is contained in:
Jack·Boos·Yu 2022-04-14 01:47:44 +08:00 committed by GitHub
parent e809a42f87
commit 8f443619b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ports/discordcoreapi/fix-cert-installation.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 10cd8d1..1439aa0 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -27,19 +27,19 @@ file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/Include/discordcoreapi/*.hpp")
if (UNIX)
add_library(DiscordCoreAPI STATIC "${SOURCES}" "${VersionFilesOutputVariable}")
message(STATUS "Copying a file...")
- configure_file("${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" "/home/$ENV{USER}/SSL/Certs/SoundCloudCert.pem" COPYONLY)
+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" DESTINATION share/discordcoreapi/data)
message(STATUS "Copying a file...")
- configure_file("${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" "/home/$ENV{USER}/SSL/Certs/GoogleCert.pem" COPYONLY)
+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" DESTINATION share/discordcoreapi/data)
message(STATUS "Copying a file...")
- configure_file("${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" "/home/$ENV{USER}/SSL/Certs/DiscordCert.pem" COPYONLY)
+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" DESTINATION share/discordcoreapi/data)
elseif (WIN32)
add_library(DiscordCoreAPI SHARED "${SOURCES}" "${VersionFilesOutputVariable}")
message(STATUS "Copying a file...")
- configure_file("${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" "C:/SSL/Certs/SoundCloudCert.pem" COPYONLY)
+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" DESTINATION share/discordcoreapi/data)
message(STATUS "Copying a file...")
- configure_file("${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" "C:/SSL/Certs/GoogleCert.pem" COPYONLY)
+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" DESTINATION share/discordcoreapi/data)
message(STATUS "Copying a file...")
- configure_file("${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" "C:/SSL/Certs/DiscordCert.pem" COPYONLY)
+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" DESTINATION share/discordcoreapi/data)
endif()
if (EXISTS ${VCPKG_INSTALLED_DIR})

3
ports/discordcoreapi/portfile.cmake
View File

@ -8,6 +8,7 @@ vcpkg_from_github(
REF 6d7c899f0690513855119aa225259dccf17b10f0
SHA512 ff42ed8ae799b8f875158842c47fcb5612a5b8861dbfb442c97ab131d952ed59140b2d2431a0d389aefbecb122263f340ff9c8fb863466d0aa91875f8080616e
HEAD_REF main
PATCHES fix-cert-installation.patch
)
vcpkg_cmake_configure(
@ -22,7 +23,7 @@ vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")

1
ports/discordcoreapi/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "discordcoreapi",
"version-date": "2022-03-30",
"port-version": 1,
"description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
"homepage": "https://discordcoreapi.com",
"license": "AGPL-3.0-or-later",

2
versions/baseline.json
View File

@ -1890,7 +1890,7 @@
},
"discordcoreapi": {
"baseline": "2022-03-30",
"port-version": 0
"port-version": 1
},
"discount": {
"baseline": "2.2.6",

5
versions/d-/discordcoreapi.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "70c609a4d2bc6319e046e08e25842c4559bfc556",
"version-date": "2022-03-30",
"port-version": 1
},
{
"git-tree": "d7e58144cce6a1eeda7ae8cac47726a9edddfbec",
"version-date": "2022-03-30",