diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-15 13:56:20 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-15 13:56:20 -0700 |
| commit | 28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7 (patch) | |
| tree | a7952616386d4fa19ee9f44aff204e27de85f249 /scripts | |
| parent | 957cb214e92f45069f142d8b6ccf2a6425df9c51 (diff) | |
| parent | cd7f4cccffd915edc2d4b625ff32dea970ec073f (diff) | |
| download | vcpkg-28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7.tar.gz vcpkg-28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7.zip | |
Merge branch 'master' into qualifier_change
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_acquire_msys.cmake | 2 | ||||
| -rw-r--r-- | scripts/fetchDependency.ps1 | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 905952eab..87c34c274 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -32,7 +32,7 @@ ## vcpkg_execute_required_process( ## COMMAND ## ${BASH} --noprofile --norc -c -## "PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed make" +## 'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed make' ## WORKING_DIRECTORY ${MSYS_ROOT} ## LOGNAME pacman-${TARGET_TRIPLET}) ## ``` diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index eecd7fe5a..d142f57fe 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -151,37 +151,37 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) if($Dependency -eq "cmake") { - $requiredVersion = "3.9.0" - $downloadVersion = "3.9.0" - $url = "https://cmake.org/files/v3.9/cmake-3.9.0-win32-x86.zip" - $downloadPath = "$downloadsDir\cmake-3.9.0-win32-x86.zip" - $expectedDownloadedFileHash = "9d593839f64b94718a1b75b8519b56ecb959e4d37d406bf2a087e2c1f7a6b89c" - $executableFromDownload = "$downloadsDir\cmake-3.9.0-win32-x86\bin\cmake.exe" + $requiredVersion = "3.9.1" + $downloadVersion = "3.9.1" + $url = "https://cmake.org/files/v3.9/cmake-3.9.1-win32-x86.zip" + $downloadPath = "$downloadsDir\cmake-3.9.1-win32-x86.zip" + $expectedDownloadedFileHash = "e0d9501bd34e3100e925dcb2e07f5f0ce8980bdbe5fce0ae950b21368d54c1a1" + $executableFromDownload = "$downloadsDir\cmake-3.9.1-win32-x86\bin\cmake.exe" $extractionType = $ExtractionType_ZIP $extractionFolder = $downloadsDir } elseif($Dependency -eq "nuget") { - $requiredVersion = "3.3.0" - $downloadVersion = "3.5.0" - $url = "https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe" - $downloadPath = "$downloadsDir\nuget-3.5.0\nuget.exe" - $expectedDownloadedFileHash = "399ec24c26ed54d6887cde61994bb3d1cada7956c1b19ff880f06f060c039918" + $requiredVersion = "4.1.0" + $downloadVersion = "4.1.0" + $url = "https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe" + $downloadPath = "$downloadsDir\nuget-4.1.0\nuget.exe" + $expectedDownloadedFileHash = "4c1de9b026e0c4ab087302ff75240885742c0faa62bd2554f913bbe1f6cb63a0" $executableFromDownload = $downloadPath $extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED } elseif($Dependency -eq "git") { - $requiredVersion = "2.0.0" - $downloadVersion = "2.11.1" - $url = "https://github.com/git-for-windows/git/releases/download/v2.11.1.windows.1/MinGit-2.11.1-32-bit.zip" # We choose the 32-bit version - $downloadPath = "$downloadsDir\MinGit-2.11.1-32-bit.zip" - $expectedDownloadedFileHash = "6ca79af09015625f350ef4ad74a75cfb001b340aec095b6963be9d45becb3bba" + $requiredVersion = "2.14.1" + $downloadVersion = "2.14.1" + $url = "https://github.com/git-for-windows/git/releases/download/v2.14.1.windows.1/MinGit-2.14.1-32-bit.zip" # We choose the 32-bit version + $downloadPath = "$downloadsDir\MinGit-2.14.1-32-bit.zip" + $expectedDownloadedFileHash = "77b468e0ead1e7da4cb3a1cf35dabab5210bf10457b4142f5e9430318217cdef" # There is another copy of git.exe in MinGit\bin. However, an installed version of git add the cmd dir to the PATH. # Therefore, choosing the cmd dir here as well. - $executableFromDownload = "$downloadsDir\MinGit-2.11.1-32-bit\cmd\git.exe" + $executableFromDownload = "$downloadsDir\MinGit-2.14.1-32-bit\cmd\git.exe" $extractionType = $ExtractionType_ZIP - $extractionFolder = "$downloadsDir\MinGit-2.11.1-32-bit" + $extractionFolder = "$downloadsDir\MinGit-2.14.1-32-bit" } else { |