Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[json-dto] Update to v0.2.9; Switch repo; Fix license installation #9057

Merged
merged 2 commits into from
Nov 22, 2019
+6 −7
Merged

[json-dto] Update to v0.2.9; Switch repo; Fix license installation #9057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d5a3d2
json-dto updated to v.0.2.9.
eao197 Nov 20, 2019
0112cf8
Update to json-dto-0.2.9.1.
eao197 Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/json-dto/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: json-dto
Version: 0.2.8-2
Version: 0.2.9
Description: A small header-only library for converting data between json representation and c++ structs.
Build-Depends: rapidjson
9 changes: 5 additions & 4 deletions ports/json-dto/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
include(vcpkg_common_functions)

vcpkg_from_bitbucket(
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO sobjectizerteam/json_dto-0.2
REF v.0.2.8
SHA512 50a2d8d31f4cf67bdf84a58bae5f95642f4be571e8e052a48830be119d5e3c4ddbb19c5ac97fc0f8383c9958d64ec9be4ce23019c1da4f2cbf4b8ddbf23f5ad7
REPO stiffstream/json_dto
REF v.0.2.9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update 'REF v.0.2.9' to 'REF 088c1fefb259267874ad9f9260f0bc1d564ddd7c # v.0.2.9'? since the commit id is more stable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've applied proposed changes and updated json-dto to the latest version.

SHA512 6a34e24c784f002bb3b025af93dc24c485090bc1f9ce55472a54929fe58fa4b1bf6f1ff5d2fea9fb33c8bc87aeae6a926cbb2d196f1e7172bb1a356935f3a7b6
)

vcpkg_configure_cmake(
Expand All @@ -26,3 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug)
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/json-dto)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/json-dto/LICENSE ${CURRENT_PACKAGES_DIR}/share/json-dto/copyright)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also update 'Handle copyright' with following function:
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright )