From b755c30bc7f4a48db344eb1a25873e56b31925c0 Mon Sep 17 00:00:00 2001 From: kiwixz Date: Sat, 16 Mar 2019 17:40:31 +0100 Subject: update to cmake 3.14 (allow VS2019RC) --- scripts/cmake/vcpkg_configure_cmake.cmake | 13 ++++------ scripts/vcpkgTools.xml | 40 +++++++++++++++---------------- 2 files changed, 24 insertions(+), 29 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 584e93251..83acf1bae 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -109,16 +109,11 @@ function(vcpkg_configure_cmake) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(GENERATOR "Visual Studio 15 2017") set(ARCH "ARM64") + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142") - if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(VCPKG_CMAKE_SYSTEM_NAME Windows) - endif() - message(FATAL_ERROR -"Unable to determine appropriate CMake MSBuild generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}. -This is because CMake 3.12.4 does not currently have a 'Visual Studio 16 2019' option. -This can be worked around by either: - 1. Install Visual Studio 2017 Stable -") + set(GENERATOR "Visual Studio 16 2019") + set(ARCH "${VCPKG_TARGET_ARCHITECTURE}") + else() if(NOT VCPKG_CMAKE_SYSTEM_NAME) set(VCPKG_CMAKE_SYSTEM_NAME Windows) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 18ca741c2..e371e548f 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,32 +1,32 @@ - 3.12.4 - cmake-3.12.4-win32-x86\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-win32-x86.zip - ca7097c5917101c39d5fa5325cd256ad3aa616a7e5811915cb2869c24961dc133726015b3576908fbd0666f89c8e31886bed9cf6b532a3fe44681d5245bc25c7 - cmake-3.12.4-win32-x86.zip + 3.14.0 + cmake-3.14.0-win32-x86\bin\cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-win32-x86.zip + 60eb6a0790883da4152a957bd1133405f620f4b7a073af3bea97695b3ef8c22c41d9b90e45815f2a896df5be0cd6dedb73a6df5f17a42761ca8f457c9f3b708c + cmake-3.14.0-win32-x86.zip - 3.12.4 - cmake-3.12.4-Darwin-x86_64/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Darwin-x86_64.tar.gz - 67ce23394d9679818ab0f2792f5d585c8c6f385e18584d488a47d48b768d1ee20b58247d22945aeff1ff9f84b7e843457dac98a50801ac3068ab1fbcbe0b0f45 - cmake-3.12.4-Darwin-x86_64.tar.gz + 3.14.0 + cmake-3.14.0-Darwin-x86_64/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Darwin-x86_64.tar.gz + a5a7217a049be3bb2ef5c93292b1d92eb4dd5ec6ab2dd04984aae01d2732eb343cea4f9741b333a5e21a27eb7934f568f780f3558e7ff870150c3309fc4656b3 + cmake-3.14.0-Darwin-x86_64.tar.gz - 3.12.4 - cmake-3.12.4-Linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.tar.gz - ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f - cmake-3.12.4-Linux-x86_64.tar.gz + 3.14.0 + cmake-3.14.0-Linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz + e687c0f3acfb15c880ddac67e2821907f833cb900c6ecedb4ab5df5102604d82753c948e3c7dca6e5bcce6278a09b7d577b1afade2e133aec5b2057ac48d3c74 + cmake-3.14.0-Linux-x86_64.tar.gz - 3.12.4 - cmake-3.12.4-FreeBSD-x86_64/bin/cmake - https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz - b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479 - cmake-3.12.4-FreeBSD-x86_64.tar.gz + 3.14.0 + + + + 2.20.0 -- cgit v1.2.3 From caa7981dcfbdc2da76335d82920bb781f7b047d6 Mon Sep 17 00:00:00 2001 From: kiwixz Date: Sat, 16 Mar 2019 17:53:31 +0100 Subject: fix vs2019 arch specification --- scripts/cmake/vcpkg_configure_cmake.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 83acf1bae..ceff199ab 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -110,9 +110,18 @@ function(vcpkg_configure_cmake) set(GENERATOR "Visual Studio 15 2017") set(ARCH "ARM64") - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v142") set(GENERATOR "Visual Studio 16 2019") - set(ARCH "${VCPKG_TARGET_ARCHITECTURE}") + set(ARCH "Win32") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v142") + set(GENERATOR "Visual Studio 16 2019") + set(ARCH "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v142") + set(GENERATOR "Visual Studio 16 2019") + set(ARCH "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v142") + set(GENERATOR "Visual Studio 16 2019") + set(ARCH "ARM64") else() if(NOT VCPKG_CMAKE_SYSTEM_NAME) -- cgit v1.2.3 From e9c47b0a8a569a76b9b67f65169979625faad789 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 19 Mar 2019 16:32:24 -0700 Subject: [vcpkg] Update to CMake 3.14.0 --- scripts/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7a1b2777b..056b21cac 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -78,7 +78,7 @@ vcpkgCheckEqualFileHash() echo " File path: [ $downloadPath ]" echo " Expected hash: [ $sha512 ]" echo " Actual hash: [ $actualHash ]" - exit + exit 1 fi } @@ -234,8 +234,8 @@ buildDir="$vcpkgRootDir/toolsrc/build.rel" rm -rf "$buildDir" mkdir -p "$buildDir" -(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics") -(cd "$buildDir" && "$cmakeExe" --build .) +(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics") || exit 1 +(cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" cp "$buildDir/vcpkg" "$vcpkgRootDir/" -- cgit v1.2.3 From 4c516c62ee2b1719f9b396f2f18b58ef3e293561 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 20 Mar 2019 16:40:45 -0700 Subject: [vcpkg] Revert change to freebsd cmake version --- scripts/vcpkgTools.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index e371e548f..48ff92223 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -22,11 +22,11 @@ cmake-3.14.0-Linux-x86_64.tar.gz - 3.14.0 - - - - + 3.12.4 + cmake-3.12.4-Linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.tar.gz + ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f + cmake-3.12.4-Linux-x86_64.tar.gz 2.20.0 -- cgit v1.2.3 From 399665d1ea0bf44a47b1fa2fe0544595fd204eb8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 20 Mar 2019 16:46:02 -0700 Subject: [vcpkg] Fixup previous commit --- scripts/vcpkgTools.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 48ff92223..6b07c6cb1 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -23,10 +23,10 @@ 3.12.4 - cmake-3.12.4-Linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.tar.gz - ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f - cmake-3.12.4-Linux-x86_64.tar.gz + cmake-3.12.4-FreeBSD-x86_64/bin/cmake< + https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz + b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479 + cmake-3.12.4-FreeBSD-x86_64.tar.gz 2.20.0 -- cgit v1.2.3 From f41cc7b47cd0e846e047891b605f6870cc598ccb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 20 Mar 2019 16:47:25 -0700 Subject: [vcpkg] Fixup previous commit --- scripts/vcpkgTools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 6b07c6cb1..a5b46c3ca 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -23,7 +23,7 @@ 3.12.4 - cmake-3.12.4-FreeBSD-x86_64/bin/cmake< + cmake-3.12.4-FreeBSD-x86_64/bin/cmake https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479 cmake-3.12.4-FreeBSD-x86_64.tar.gz -- cgit v1.2.3 From 0fffb47ed02507aeacc29c64d91e9d4639f981f6 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 2 Apr 2019 15:49:03 -0500 Subject: Fix vcpkg_find_acquire_program(NUGET) (#5871) Set the ARCHIVE and NOEXTRACT variables so that downloading works. Also HASH is case-sensitive, so make it lower case. vcpkg_find_acquire_program(NUGET) was failing with the following error message: -- Downloading https://dist.nuget.org/win-x86-commandline/v4.8.1/nuget.exe... CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:159 (file): file DOWNLOAD error: cannot create directory 'C:/Users/david/Documents/GitHub/vcpkg/downloads/temp/C:/Users/david/Documents/GitHub/vcpkg/downloads' - Specify file by full path name and verify that you have directory creation and file write privileges. Call Stack (most recent call first): scripts/cmake/vcpkg_find_acquire_program.cmake:255 (vcpkg_download_distfile) ports/gobject-introspection/portfile.cmake:20 (vcpkg_find_acquire_program) scripts/ports.cmake:71 (include) --- scripts/cmake/vcpkg_find_acquire_program.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index d8dd10b2b..1642bf3b4 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -136,7 +136,9 @@ function(vcpkg_find_acquire_program VAR) set(PATHS "${DOWNLOADS}/tools/nuget") set(BREW_PACKAGE_NAME "nuget") set(URL "https://dist.nuget.org/win-x86-commandline/v4.8.1/nuget.exe") - set(HASH 42CB744338AF8DECC033A75BCE5B4C4DF28E102BAFC45F9A8BA86D7BC010F5B43EBACAE80D7B28C4F85AC900EEFC2A349620AE65F27F6CA1C21C53B63B92924B) + set(ARCHIVE "nuget.exe") + set(NOEXTRACT ON) + set(HASH 42cb744338af8decc033a75bce5b4c4df28e102bafc45f9a8ba86d7bc010f5b43ebacae80d7b28c4f85ac900eefc2a349620ae65f27f6ca1c21c53b63b92924b) elseif(VAR MATCHES "MESON") set(PROGNAME meson) set(REQUIRED_INTERPRETER PYTHON3) -- cgit v1.2.3 From af1597e229ce434e65749967e6b2687cfdc80040 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 2 Apr 2019 20:54:22 -0700 Subject: [vcpkg-fetch] Set git subpath to mingw32\bin\git.exe to fix execution within containers (#5878) --- scripts/vcpkgTools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 18ca741c2..6578f1b52 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -30,7 +30,7 @@ 2.20.0 - cmd\git.exe + mingw32\bin\git.exe https://github.com/git-for-windows/git/releases/download/v2.20.0.windows.1/PortableGit-2.20.0-32-bit.7z.exe 81647a87df9fde0945ef597cb1cafd8f5f42859da89e9b1db55222a261407bc16bdcc0cf1e86e315697f0981832fe10fc02845cad4b4c82ea64bbd218aec6a49 PortableGit-2.20.0-32-bit.7z.exe -- cgit v1.2.3 From d788ada4e97ce5b36fc397a94da453814342ec43 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 3 Apr 2019 02:16:30 -0700 Subject: [vtk] Fix flakiness by relying on vcpkg-provided dependencies [libharu] Add patches required for vtk [vcpkg-build-cmake] Add retry logic for mt.exe failures --- scripts/cmake/vcpkg_build_cmake.cmake | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake index 2f0da07f9..e86632c7e 100644 --- a/scripts/cmake/vcpkg_build_cmake.cmake +++ b/scripts/cmake/vcpkg_build_cmake.cmake @@ -162,6 +162,33 @@ function(vcpkg_build_cmake) endif() endwhile() endif() + elseif(out_contents MATCHES "mt : general error c101008d: ") + # Antivirus workaround - occasionally files are locked and cause mt.exe to fail + set(ITERATION 0) + while (ITERATION LESS 3 AND out_contents MATCHES "mt : general error c101008d: ") + MATH(EXPR ITERATION "${ITERATION}+1") + message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${ITERATION}") + execute_process( + COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} + OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log" + ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log" + RESULT_VARIABLE error_code + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) + + if(error_code) + file(READ "${LOGPREFIX}-out-${ITERATION}.log" out_contents) + file(READ "${LOGPREFIX}-err-${ITERATION}.log" err_contents) + + if(out_contents) + list(APPEND LOGS "${LOGPREFIX}-out-${ITERATION}.log") + endif() + if(err_contents) + list(APPEND LOGS "${LOGPREFIX}-err-${ITERATION}.log") + endif() + else() + break() + endif() + endwhile() endif() if(error_code) @@ -170,7 +197,7 @@ function(vcpkg_build_cmake) file(TO_NATIVE_PATH "${LOG}" NATIVE_LOG) list(APPEND STRINGIFIED_LOGS " ${NATIVE_LOG}\n") endforeach() - set(_eb_COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG}) + set(_eb_COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG}) set(_eb_WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) message(FATAL_ERROR " Command failed: ${_eb_COMMAND}\n" -- cgit v1.2.3 From 83f13067f39ce351a0992484e8b3adcc295ff48b Mon Sep 17 00:00:00 2001 From: Phoebe <925731795@qq.com> Date: Wed, 3 Apr 2019 14:43:56 -0700 Subject: [Thrift] Updates 2019.03.29 (#5924) --- scripts/toolchains/windows.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index 266e023b1..12b1ae7f9 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -9,7 +9,6 @@ if(NOT _CMAKE_IN_TRY_COMPILE) message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"") endif() - set(CHARSET_FLAG "/utf-8") if(VCPKG_PLATFORM_TOOLSET MATCHES "v120") # VS 2013 does not support /utf-8 set(CHARSET_FLAG) -- cgit v1.2.3 From 0e4c999b21c0ba09eb21fea2722f97c9a6c2ac50 Mon Sep 17 00:00:00 2001 From: Damian Jarek Date: Fri, 5 Apr 2019 04:13:10 +0200 Subject: Fix installation failure when system Boost present (#5939) Boost 1.70 introduces "native" cmake config scripts which are accidentally used when installing a vcpkg package. This only occurs when Boost 1.70 is installed in the system when the user uses `vcpkg install`. Signed-off-by: Damian Jarek --- scripts/buildsystems/vcpkg.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b8037f466..b2a589421 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -192,6 +192,7 @@ macro(find_package name) set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) unset(Boost_USE_STATIC_RUNTIME) + set(Boost_NO_BOOST_CMAKE ON) unset(Boost_USE_STATIC_RUNTIME CACHE) set(Boost_COMPILER "-vc140") _find_package(${ARGV}) -- cgit v1.2.3 From 880181892e83b89657207777b1f2ce40fe3d31cb Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 10 Apr 2019 12:34:46 -0700 Subject: partial update for testing --- scripts/vcpkgTools.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 15f891979..b4af7039e 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -29,11 +29,11 @@ cmake-3.12.4-FreeBSD-x86_64.tar.gz - 2.20.0 + 2.21.0 mingw32\bin\git.exe - https://github.com/git-for-windows/git/releases/download/v2.20.0.windows.1/PortableGit-2.20.0-32-bit.7z.exe - 81647a87df9fde0945ef597cb1cafd8f5f42859da89e9b1db55222a261407bc16bdcc0cf1e86e315697f0981832fe10fc02845cad4b4c82ea64bbd218aec6a49 - PortableGit-2.20.0-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-32-bit.7z.exe + 0 + PortableGit-2.21.0-32-bit.7z.exe 2.7.4 -- cgit v1.2.3 From 1a3b388a911f844e6907cc9058728e2a3bdda419 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 10 Apr 2019 12:37:43 -0700 Subject: add git hash --- scripts/vcpkgTools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index b4af7039e..3f0b4a7f1 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -32,7 +32,7 @@ 2.21.0 mingw32\bin\git.exe https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-32-bit.7z.exe - 0 + d5600fc35e91cfa84e3547e38a9da9798cf0a53810cc35ac9a0dee671c4ef0e9fbcbe3eda9c790f8db4eafce7ce58d7a168d28938a66cdcca000bf5a7f5267c1 PortableGit-2.21.0-32-bit.7z.exe -- cgit v1.2.3 From dc4b27955b618780f92f880855b94be5923b34c2 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 10 Apr 2019 12:41:28 -0700 Subject: Revert "add git hash" This reverts commit 1a3b388a911f844e6907cc9058728e2a3bdda419. --- scripts/vcpkgTools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 3f0b4a7f1..b4af7039e 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -32,7 +32,7 @@ 2.21.0 mingw32\bin\git.exe https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-32-bit.7z.exe - d5600fc35e91cfa84e3547e38a9da9798cf0a53810cc35ac9a0dee671c4ef0e9fbcbe3eda9c790f8db4eafce7ce58d7a168d28938a66cdcca000bf5a7f5267c1 + 0 PortableGit-2.21.0-32-bit.7z.exe -- cgit v1.2.3 From 6c62b08fcb6b96f4447a13c5b3cdcd76b7aad310 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 10 Apr 2019 12:41:41 -0700 Subject: Revert "partial update for testing" This reverts commit 880181892e83b89657207777b1f2ce40fe3d31cb. --- scripts/vcpkgTools.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index b4af7039e..15f891979 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -29,11 +29,11 @@ cmake-3.12.4-FreeBSD-x86_64.tar.gz - 2.21.0 + 2.20.0 mingw32\bin\git.exe - https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-32-bit.7z.exe - 0 - PortableGit-2.21.0-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.20.0.windows.1/PortableGit-2.20.0-32-bit.7z.exe + 81647a87df9fde0945ef597cb1cafd8f5f42859da89e9b1db55222a261407bc16bdcc0cf1e86e315697f0981832fe10fc02845cad4b4c82ea64bbd218aec6a49 + PortableGit-2.20.0-32-bit.7z.exe 2.7.4 -- cgit v1.2.3