From 4ecf9aa09e05d59e56bf2d53ac267fc81626f603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernesto=20Basc=C3=B3n=20Pantoja?= Date: Tue, 11 Apr 2017 00:18:20 -0400 Subject: [PATCH 1/2] Added picojson 1.3.1 --- ports/picojson/CONTROL | 4 ++++ ports/picojson/portfile.cmake | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 ports/picojson/CONTROL create mode 100644 ports/picojson/portfile.cmake diff --git a/ports/picojson/CONTROL b/ports/picojson/CONTROL new file mode 100644 index 0000000000..8128aa099f --- /dev/null +++ b/ports/picojson/CONTROL @@ -0,0 +1,4 @@ +Source: picojson +Version: 1.3.1 +Description: A header-file-only, JSON parser serializer in C++. + diff --git a/ports/picojson/portfile.cmake b/ports/picojson/portfile.cmake new file mode 100644 index 0000000000..91f2f2aa56 --- /dev/null +++ b/ports/picojson/portfile.cmake @@ -0,0 +1,18 @@ + +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/picojson-master) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/kazuho/picojson/archive/master.zip" + FILENAME "picojson-1.3.1.zip" + SHA512 961138c1233ee960c8810cd0e53af27b42956ec0ed4017085b2330417833f91ba728dd76e64ece019a37eb5f8a857cc57d36c3370a27707d995091ab409c4819 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +# Put the licence file where vcpkg expects it +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/picojson) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/picojson/LICENSE ${CURRENT_PACKAGES_DIR}/share/picojson/copyright) + +# Copy the header files +file(INSTALL ${SOURCE_PATH}/picojson.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/picojson) + +vcpkg_copy_pdbs() From ed6930bd618d909fecacacffcd6765d45fb91d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernesto=20Basc=C3=B3n=20Pantoja?= Date: Thu, 13 Apr 2017 01:22:02 -0400 Subject: [PATCH 2/2] Using 1.3.0 instead of master as suggested by ras0219-msft --- ports/picojson/CONTROL | 2 +- ports/picojson/portfile.cmake | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/picojson/CONTROL b/ports/picojson/CONTROL index 8128aa099f..a871ae3d45 100644 --- a/ports/picojson/CONTROL +++ b/ports/picojson/CONTROL @@ -1,4 +1,4 @@ Source: picojson -Version: 1.3.1 +Version: 1.3.0 Description: A header-file-only, JSON parser serializer in C++. diff --git a/ports/picojson/portfile.cmake b/ports/picojson/portfile.cmake index 91f2f2aa56..c155275d35 100644 --- a/ports/picojson/portfile.cmake +++ b/ports/picojson/portfile.cmake @@ -1,10 +1,10 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/picojson-master) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/picojson-rel-v1.3.0) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/kazuho/picojson/archive/master.zip" - FILENAME "picojson-1.3.1.zip" - SHA512 961138c1233ee960c8810cd0e53af27b42956ec0ed4017085b2330417833f91ba728dd76e64ece019a37eb5f8a857cc57d36c3370a27707d995091ab409c4819 + URLS "https://github.com/kazuho/picojson/archive/rel/v1.3.0.zip" + FILENAME "picojson-1.3.0.zip" + SHA512 d1da5748b6a03e92ca4fa475a918842f5eede955f747359fa4d9d85f9ed9efac8b3748a306c2f9f71b9924099ba5e1f8f949e50cdf6f26bc3778865121725ddf ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -16,3 +16,4 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/picojson/LICENSE ${CURRENT_PACKAGES_DI file(INSTALL ${SOURCE_PATH}/picojson.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/picojson) vcpkg_copy_pdbs() +