From 7c04036e7218cc73a059dd0f308382fda54d2a8a Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Wed, 2 Jan 2019 18:17:58 +0100 Subject: Windows: use lua-unicode as built with VS 2017 These binaries were built by AppVeyor using VS 2017 (MSVC 19.16.27025.1) and replaces locally built binaries using VS 2015 (MSVC 19.0.24215.1). I believe that these are the same as both of them use VCRUNTIME140.dll and import the same symbols. Using a newer compiler should however remove any doubt of compatibility with VS 2017 and should address concerns from Anders and Graham. These files are actually the "msvc2017_*.zip" files from https://github.com/Lekensteyn/lua-unicode/releases/tag/5.2.4-release1 Change-Id: Ib3fdf4678267fa10c0729f98ae0ce3153ac278a4 Reviewed-on: https://code.wireshark.org/review/31307 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- tools/win-setup.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 72c03e18a0..4de31545c0 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -69,8 +69,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2018-12-28" -$Win32CurrentTag = "2018-12-28" +$Win64CurrentTag = "2019-01-02" +$Win32CurrentTag = "2019-01-02" # Archive file / SHA256 $Win64Archives = @{ @@ -84,7 +84,7 @@ $Win64Archives = @{ "libsmi-svn-40773-win64ws.zip" = "571fcee71d741bf847c3247d4c2e1c42388ca6a9feebe08fc0d4ce053571d15d"; "libssh-0.7.3-1-win64ws.zip" = "3a81b9f4a914a46f15243bbb13b6919ef1c20d4bf502c47646caeccff2cbd75c"; "libxml2-2.9.4-win64ws.zip" = "bb1892f5506f281d8f2b6c8be4fa8e83a9a3fb94c9160466fa59afdc5110d52e"; - "lua-5.2.4-unicode-win64-vc14.zip" = "fdf24928931a55d1f0bdb909820d5389cbc0ba510528a16e499e33c034ca508d"; + "lua-5.2.4-unicode-win64-vc14.zip" = "e8968d2c7871ce1ea82cbd29ac1b3a2c59d3dec25e483c5e12de85df66f5d928"; "lz4-1.7.5-win64ws.zip" = "dc946b68238c25cbc216901332d608d7f4b084be2d401210f74ce68b9b93207f"; "MaxMindDB-1.3.2-win64ws.zip" = "9025c43e9b21ff0bfbaf206b8ed96e2920ef1434107f789e4c7c0c1d8b508952"; "nghttp2-1.14.0-1-win64ws.zip" = "a4f15854f30b4fbb65cbf150011612e4580683dc9bbb339c632c37e414c938cb"; @@ -107,7 +107,7 @@ $Win32Archives = @{ "libsmi-svn-40773-win32ws.zip" = "44bc81edfeb8948322ca365fc632e419383907c305cc922e6b74fdbb13827958"; "libssh-0.7.3-1-win32ws.zip" = "b02f0d318175194ac538a24c9c9fc280a0ecad69fb3afd4945c106b4b7c4fa6f"; "libxml2-2.9.4-win32ws.zip" = "147e521abacdd96913f7f94d1da44d59ee138e510922f3c1e03e485c8c9d8d1c"; - "lua-5.2.4-unicode-win32-vc14.zip" = "609337fb9db817f94c7813ebceb44226a8d71a41896656ff5e8308ecd52968b5"; + "lua-5.2.4-unicode-win32-vc14.zip" = "ca2368a83f623674178e9441f71fb791e3c0b46f208e3dac28c6ac735f034bff"; "lz4-1.7.5-win32ws.zip" = "1b2e4b509163bc5039c0694369b9e40ba27cdbf4c4c88fcd454ba6a34c79b41b"; "MaxMindDB-1.3.2-win32ws.zip" = "5c8b4bf3092da8fad6edb005a5283c6a74b7e115a50da010953eed77d33c11b7"; "nghttp2-1.14.0-1-win32ws.zip" = "939ec18c81fed2e44270dc924fad8beffe90a74300cc98360442300fb0a5c292"; -- cgit v1.2.3