Windows: update LZ4 to 1.7.5 and USBPcap to 1.2.0.1
Change-Id: I02eb4c255a0794b650f566abdadcac16e97196af Reviewed-on: https://code.wireshark.org/review/21609 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
parent
d2e7e0b519
commit
46ef2dabfd
|
@ -41,7 +41,7 @@ if( LZ4_FOUND )
|
|||
CACHE PATH "Path to LZ4 DLL"
|
||||
)
|
||||
file( GLOB _lz4_dll RELATIVE "${LZ4_DLL_DIR}"
|
||||
"${LZ4_DLL_DIR}/liblz4-*.dll"
|
||||
"${LZ4_DLL_DIR}/liblz4*.dll"
|
||||
)
|
||||
set ( LZ4_DLL ${_lz4_dll}
|
||||
# We're storing filenames only. Should we use STRING instead?
|
||||
|
|
|
@ -66,7 +66,7 @@ set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}")
|
|||
set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION})
|
||||
string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}")
|
||||
|
||||
set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5")
|
||||
set(USBPCAP_DISPLAY_VERSION "1.2.0.1")
|
||||
|
||||
set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
!define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@"
|
||||
!define WINPCAP_PACKAGE_VERSION @WINPCAP_PACKAGE_VERSION@
|
||||
!define PCAP_DISPLAY_VERSION @PCAP_DISPLAY_VERSION@
|
||||
!define USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5"
|
||||
!define USBPCAP_DISPLAY_VERSION "1.2.0.1"
|
||||
!define VERSION @VERSION@
|
||||
!define VERSION_MAJOR @VERSION_MAJOR@
|
||||
!define VERSION_MINOR @VERSION_MINOR@
|
||||
|
|
|
@ -90,7 +90,7 @@ set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}")
|
|||
set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION})
|
||||
string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}")
|
||||
|
||||
set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5")
|
||||
set(USBPCAP_DISPLAY_VERSION "1.2.0.1")
|
||||
|
||||
set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})
|
||||
|
||||
|
|
|
@ -99,8 +99,8 @@ Param(
|
|||
# trouble instead of trying to catch exceptions everywhere.
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$Win64CurrentTag = "2017-04-18"
|
||||
$Win32CurrentTag = "2017-04-18"
|
||||
$Win64CurrentTag = "2017-05-11"
|
||||
$Win32CurrentTag = "2017-05-11"
|
||||
|
||||
# Archive file / subdir.
|
||||
$Win64Archives = @{
|
||||
|
@ -115,7 +115,7 @@ $Win64Archives = @{
|
|||
"libssh-0.7.3-1-win64ws.zip" = "";
|
||||
"libxml2-2.9.4-win64ws.zip" = "";
|
||||
"lua-5.2.4_Win64_dllw4_lib.zip" = "lua5.2.4";
|
||||
"lz4-r131-1-win64ws.zip" = "";
|
||||
"lz4-1.7.5-win64ws.zip" = "";
|
||||
"nasm-2.09.08-win32.zip" = "";
|
||||
"nghttp2-1.14.0-1-win64ws.zip" = "";
|
||||
"portaudio_v19_2.zip" = "";
|
||||
|
@ -140,7 +140,7 @@ $Win32Archives = @{
|
|||
"libssh-0.7.3-1-win32ws.zip" = "";
|
||||
"libxml2-2.9.4-win32ws.zip" = "";
|
||||
"lua-5.2.4_Win32_dllw4_lib.zip" = "lua5.2.4";
|
||||
"lz4-r131-1-win32ws.zip" = "";
|
||||
"lz4-1.7.5-win32ws.zip" = "";
|
||||
"nasm-2.09.08-win32.zip" = "";
|
||||
"nghttp2-1.14.0-1-win32ws.zip" = "";
|
||||
"portaudio_v19_2.zip" = "";
|
||||
|
@ -157,12 +157,12 @@ $Win32Archives = @{
|
|||
|
||||
$Win32Files = @(
|
||||
"WinPcap_4_1_3.exe";
|
||||
"USBPcapSetup-1.1.0.0-g794bf26-5.exe";
|
||||
"USBPcapSetup-1.2.0.1.exe";
|
||||
)
|
||||
|
||||
$Win64Files = @(
|
||||
"WinPcap_4_1_3.exe";
|
||||
"USBPcapSetup-1.1.0.0-g794bf26-5.exe";
|
||||
"USBPcapSetup-1.2.0.1.exe";
|
||||
)
|
||||
|
||||
$Archives = $Win64Archives;
|
||||
|
@ -193,7 +193,7 @@ $CleanupItems = @(
|
|||
"libxml2-*-win??ws"
|
||||
"lua5.1.4"
|
||||
"lua5.2.?"
|
||||
"lz4-r131-win??ws"
|
||||
"lz4-*-win??ws"
|
||||
"nasm-2.09.08"
|
||||
"nghttp2-*-win??ws"
|
||||
"portaudio_v19"
|
||||
|
|
Loading…
Reference in New Issue