From d0155a477e94bd860dbee57a16a19b675013c171 Mon Sep 17 00:00:00 2001 From: paercebal Date: Wed, 30 Aug 2017 22:18:58 +0200 Subject: [PATCH 1/3] Update xerces-c port files to retrieve it from github --- ports/xerces-c/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 1208c97877..e3fc9bb04a 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -17,12 +17,12 @@ if (VCPKG_CRT_LINKAGE STREQUAL "static") endif() -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/xerces-c-3.1.4) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/xerces-c-Xerces-C_3_1_4) vcpkg_download_distfile(ARCHIVE - URLS "http://www-us.apache.org/dist//xerces/c/3/sources/xerces-c-3.1.4.zip" - FILENAME "xerces-c-3.1.4.zip" - SHA512 3ba1bf38875bda8a294990dba73143cfd6dbfa158b17f4db1fd0ee9a08a078af969103200eaf8957756f8363c8a661983cc95124b4978eb2162dc0344a85fff8 + URLS "https://github.com/apache/xerces-c/archive/Xerces-C_3_1_4.zip" + FILENAME "Xerces-C_3_1_4.zip" + SHA512 3471134dacc4b2a25dece3c6eeab1d8143ca090f3652998c3a12c581e0351593bc0905334dd09c13864465c05952ca78f212a63d1c6c78bcd322d7aec23733cd ) vcpkg_extract_source_archive(${ARCHIVE}) From 3b8159bad00a0396a5eaac22f59e34ae96f2ea4d Mon Sep 17 00:00:00 2001 From: paercebal Date: Wed, 30 Aug 2017 23:57:27 +0200 Subject: [PATCH 2/3] use vcpkg_from_github instead --- ports/xerces-c/portfile.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index e3fc9bb04a..526004b43c 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -19,12 +19,13 @@ endif() set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/xerces-c-Xerces-C_3_1_4) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/apache/xerces-c/archive/Xerces-C_3_1_4.zip" - FILENAME "Xerces-C_3_1_4.zip" - SHA512 3471134dacc4b2a25dece3c6eeab1d8143ca090f3652998c3a12c581e0351593bc0905334dd09c13864465c05952ca78f212a63d1c6c78bcd322d7aec23733cd +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/xerces-c + REF Xerces-C_3_1_4 + SHA512 6dc3e4bb68bc32a0e8ec6dcc7ec67e21239a79c909d08ccc16c96dc5de4e73800993d1c09f589606925507baf0b2a9bf6037d28c84dae826935bf1f7a151071e + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(BUILD_ARCH "Win32") From 38712f755b0e7db5c7ecf68976c25a9f6e0bf037 Mon Sep 17 00:00:00 2001 From: paercebal Date: Thu, 31 Aug 2017 00:56:49 +0200 Subject: [PATCH 3/3] Removing explicit setting of SOURCE_PATH --- ports/xerces-c/portfile.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 526004b43c..5623e9518d 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -16,9 +16,6 @@ if (VCPKG_CRT_LINKAGE STREQUAL "static") set(VCPKG_CRT_LINKAGE "dynamic") endif() - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/xerces-c-Xerces-C_3_1_4) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/xerces-c