diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-08-31 11:48:33 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-08-31 11:56:54 +0000 |
| commit | a7dd070d55e41e76da5a3c595d3f547c8cf3837b (patch) | |
| tree | cafd4a1a982f023834edc3f00c2762e3c44dd0ff /tools/win-setup.ps1 | |
| parent | bccbae58a14c2cf635f5fd3c363b2c355215e0f9 (diff) | |
Win: switch back to Lua library compiled with MinGW
It does not suffer anymore from bug 9957
Change-Id: I871f01db67101b09a21545ecec5473941997a5cb
Reviewed-on: https://code.wireshark.org/review/17416
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'tools/win-setup.ps1')
| -rw-r--r-- | tools/win-setup.ps1 | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index ba15529bf5..c94eb8c946 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -31,8 +31,6 @@ # To do: # - Make this the source of truth. Keep the list of libs here. # - Download everything unconditionally, at least initially. -# - Download the Lua package for our compiler? It might make more -# sense to switch to Nuget instead. # Bugs: # - Unzipping from the shell seems to be slower than Cygwin's unzip or 7zip. @@ -101,8 +99,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2016-08-09" -$Win32CurrentTag = "2016-08-09" +$Win64CurrentTag = "2016-08-31" +$Win32CurrentTag = "2016-08-31" # Archive file / subdir. $Win64Archives = @{ @@ -114,6 +112,7 @@ $Win64Archives = @{ "kfw-3-2-2-x64-ws.zip" = ""; "libsmi-svn-40773-win64ws.zip" = ""; "libssh-0.7.2-win64ws.zip" = ""; + "lua-5.2.4_Win64_dllw4_lib.zip" = "lua5.2.4"; "nasm-2.09.08-win32.zip" = ""; "portaudio_v19_2.zip" = ""; "upx303w.zip" = ""; @@ -131,6 +130,7 @@ $Win32Archives = @{ "kfw-3-2-2-i386-ws-vc6.zip" = ""; "libsmi-svn-40773-win32ws.zip" = ""; "libssh-0.7.2-win32ws.zip" = ""; + "lua-5.2.4_Win32_dllw4_lib.zip" = "lua5.2.4"; "nasm-2.09.08-win32.zip" = ""; "portaudio_v19_2.zip" = ""; "upx303w.zip" = ""; @@ -139,14 +139,6 @@ $Win32Archives = @{ "zlib-1.2.8-ws.zip" = ""; } -# Lua - -if ( @("14", "12", "11", "10") -contains $VSVersion ) { - $Win64Archives["lua-5.2.4_Win64_dll$($VSVersion)_lib.zip"] = "lua5.2.4" - $Win32Archives["lua-5.2.4_Win32_dll$($VSVersion)_lib.zip"] = "lua5.2.4" -} - - # Plain file downloads $Win32Files = @( |