From a29f0cf417d81d8fd70e0b1bb77486b5389eeaf2 Mon Sep 17 00:00:00 2001 From: wangli28 Date: Sat, 12 Oct 2019 07:46:30 +0000 Subject: [PATCH 1/3] [msmpi] Upgrade to version 10.1 --- ports/msmpi/CONTROL | 2 +- ports/msmpi/portfile.cmake | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL index d21b80c37df0b2..18b13764274abf 100644 --- a/ports/msmpi/CONTROL +++ b/ports/msmpi/CONTROL @@ -1,3 +1,3 @@ Source: msmpi -Version: 10.0-2 +Version: 10.1 Description: Microsoft MPI diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 10482cb0a026e9..d9933e66f6bc46 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -4,23 +4,24 @@ if(VCPKG_CMAKE_SYSTEM_NAME) message(FATAL_ERROR "This port is only for building msmpi on Windows Desktop") endif() -set(MSMPI_VERSION "10.0.12498") +set(MSMPI_VERSION "10.1.12498") set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}) vcpkg_download_distfile(SDK_ARCHIVE - URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisdk.msi" + URLS "https://download.microsoft.com/download/2/9/e/29efe9b1-16d7-4912-a229-6734b0c4e235/msmpisdk.msi" FILENAME "msmpisdk-${MSMPI_VERSION}.msi" - SHA512 36a31b2516f45fbc26167b31d2d6419f1928aef1591033f0430d36570159205e1a3134557a4ac0462f2d879add1fc6fee87a6997032e4438b528cd42a8bbe6b1 + SHA512 5d2507de328f7ab5380ec46c105b5b1bcb56290949ad7bb91fe26ab4ec097b23cb4f9e6681827e00b20d670f0241fca5d111ebd4c88879d94780a78cfa316b91 ) macro(download_msmpi_redistributable_package) vcpkg_download_distfile(REDIST_ARCHIVE - URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisetup.exe" + URLS "https://download.microsoft.com/download/2/9/e/29efe9b1-16d7-4912-a229-6734b0c4e235/msmpisetup.exe" FILENAME "msmpisetup-${MSMPI_VERSION}.exe" - SHA512 c272dc842eb1e693f25eb580e1caf0c1fdb385611a12c20cdc6a40cf592ccbdba434a1c16edb63eef14b1a2ac6e678ac1cd561ec5fd003a5d17191a0fad281ae + SHA512 6911e50a158f7bfa5b0cd18e266a7323c6afc4034ec240f2689a9b358a1e5ec3ebb96313071f64f9bcd0d84453684a3cebad13ecf4137a41b90cee14895338b8 ) endmacro() + ### Check for correct version of installed redistributable package # We always want the ProgramFiles folder even on a 64-bit machine (not the ProgramFilesx86 folder) From c78890cd601b199be91acc6b14a341e6946d8b5a Mon Sep 17 00:00:00 2001 From: wangli28 Date: Mon, 14 Oct 2019 07:54:09 +0000 Subject: [PATCH 2/3] [msmpi] Modify download path to GitHub --- ports/msmpi/CONTROL | 3 ++- ports/msmpi/portfile.cmake | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL index 18b13764274abf..bab4f6a2c70bbf 100644 --- a/ports/msmpi/CONTROL +++ b/ports/msmpi/CONTROL @@ -1,3 +1,4 @@ Source: msmpi -Version: 10.1 +Version: 10.1.1 +Homepage: https://github.com/microsoft/Microsoft-MPI Description: Microsoft MPI diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index d9933e66f6bc46..961bf13f2ee3ad 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -8,20 +8,19 @@ set(MSMPI_VERSION "10.1.12498") set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}) vcpkg_download_distfile(SDK_ARCHIVE - URLS "https://download.microsoft.com/download/2/9/e/29efe9b1-16d7-4912-a229-6734b0c4e235/msmpisdk.msi" + URLS "https://github.com/microsoft/Microsoft-MPI/releases/download/v10.1.1/msmpisdk.msi" FILENAME "msmpisdk-${MSMPI_VERSION}.msi" SHA512 5d2507de328f7ab5380ec46c105b5b1bcb56290949ad7bb91fe26ab4ec097b23cb4f9e6681827e00b20d670f0241fca5d111ebd4c88879d94780a78cfa316b91 ) macro(download_msmpi_redistributable_package) vcpkg_download_distfile(REDIST_ARCHIVE - URLS "https://download.microsoft.com/download/2/9/e/29efe9b1-16d7-4912-a229-6734b0c4e235/msmpisetup.exe" + URLS "https://github.com/microsoft/Microsoft-MPI/releases/download/v10.1.1/msmpisetup.exe" FILENAME "msmpisetup-${MSMPI_VERSION}.exe" SHA512 6911e50a158f7bfa5b0cd18e266a7323c6afc4034ec240f2689a9b358a1e5ec3ebb96313071f64f9bcd0d84453684a3cebad13ecf4137a41b90cee14895338b8 ) endmacro() - ### Check for correct version of installed redistributable package # We always want the ProgramFiles folder even on a 64-bit machine (not the ProgramFilesx86 folder) From 7d46e20db562a8b87c7b8770d2f9f1027084c389 Mon Sep 17 00:00:00 2001 From: wangli28 Date: Tue, 21 Jan 2020 08:42:49 +0000 Subject: [PATCH 3/3] Remove include(vcpkg_common_functions) --- ports/msmpi/portfile.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 961bf13f2ee3ad..92485b8b36de19 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -1,8 +1,4 @@ -include(vcpkg_common_functions) - -if(VCPKG_CMAKE_SYSTEM_NAME) - message(FATAL_ERROR "This port is only for building msmpi on Windows Desktop") -endif() +vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") set(MSMPI_VERSION "10.1.12498") set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION})