diff options
-rw-r--r-- | Makefile.nmake | 2 | ||||
-rw-r--r-- | config.nmake | 4 | ||||
-rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
-rw-r--r-- | packaging/nsis/USBPcapPage.ini | 25 | ||||
-rw-r--r-- | packaging/nsis/config.nsh.in | 2 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 6 | ||||
-rw-r--r-- | tools/win-setup.ps1 | 8 |
7 files changed, 37 insertions, 12 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 910a4ac93d..9cc31a0586 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1107,7 +1107,7 @@ process_libs: !ENDIF @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ . \ - USBPcapSetup-1.1.0.0-g794bf26-1.exe \ + USBPcapSetup-1.1.0.0-g794bf26-3.exe \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" !IF "$(WIN_SETUP_OPT)" == "--download" @$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)" "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" diff --git a/config.nmake b/config.nmake index 8d35b46835..df21f81eee 100644 --- a/config.nmake +++ b/config.nmake @@ -266,7 +266,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -DOWNLOAD_TAG=2015-12-11 +DOWNLOAD_TAG=2016-04-07 ##### Win32 Libraries ##### # # Mandatory: GLib settings @@ -520,7 +520,7 @@ GEOIP_PKG=1.6.6 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws !else -DOWNLOAD_TAG=2015-12-11 +DOWNLOAD_TAG=2016-04-07 ##### Win64 Libraries ##### # # Mandatory: GLib settings diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 8ba44ad350..3f1ad9416d 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -76,7 +76,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") +set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3") set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) # XXX Shouldn't this reflect the API / ABI version? diff --git a/packaging/nsis/USBPcapPage.ini b/packaging/nsis/USBPcapPage.ini index 5b40701c64..53cd5ab0e2 100644 --- a/packaging/nsis/USBPcapPage.ini +++ b/packaging/nsis/USBPcapPage.ini @@ -43,6 +43,31 @@ Bottom=58 Text=This text will be replaced, depending if USBPcap is already installed [Field 6] +Type=GroupBox +Left=0 +Right=-1 +Top=70 +Bottom=105 +Text=Important notice + +[Field 7] +Type=Label +Left=10 +Right=290 +Top=80 +Bottom=88 +Text=In case of issue after installation, please use the system restore point created or read + +[Field 8] +Type=Link +Left=10 +Right=250 +Top=89 +Bottom=97 +Text=https://github.com/desowin/usbpcap/issues/3 +State=https://github.com/desowin/usbpcap/issues/3 + +[Field 9] Type=Button Left=0 Right=100 diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index 0030b1de8d..827aa88f32 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -13,7 +13,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" +!define USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3" !define VERSION @VERSION@ !define VERSION_MAJOR @VERSION_MAJOR@ !define VERSION_MINOR @VERSION_MINOR@ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 1a57f6d0b6..cd001dfe5f 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -327,7 +327,7 @@ Function DisplayWinPcapPage FunctionEnd Function DisplayUSBPcapPage - !insertmacro MUI_HEADER_TEXT "Install USBPcap?" "USBPcap is required to capture USB traffic. Should USBPcap be installed?" + !insertmacro MUI_HEADER_TEXT "Install USBPcap?" "USBPcap is required to capture USB traffic. Should USBPcap be installed (experimental)?" !insertmacro MUI_INSTALLOPTIONS_DISPLAY "USBPcapPage.ini" FunctionEnd @@ -841,8 +841,8 @@ IfSilent SecRequired_skip_USBPcap ReadINIStr $0 "$PLUGINSDIR\USBPcapPage.ini" "Field 4" "State" StrCmp $0 "0" SecRequired_skip_USBPcap SetOutPath $INSTDIR -File "${WIRESHARK_LIB_DIR}\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}-1.exe" -ExecWait '"$INSTDIR\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}-1.exe"' $0 +File "${WIRESHARK_LIB_DIR}\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}.exe" +ExecWait '"$INSTDIR\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}.exe"' $0 DetailPrint "USBPcap installer returned $0" ${If} $0 == "0" ${If} ${RunningX64} diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index c09e741954..e87032da4d 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -101,8 +101,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2015-12-11" -$Win32CurrentTag = "2015-12-11" +$Win64CurrentTag = "2016-04-07" +$Win32CurrentTag = "2016-04-07" # Archive file / subdir. $Win64Archives = @{ @@ -151,12 +151,12 @@ if ( @("14", "12", "11", "10") -contains $VSVersion ) { $Win32Files = @( "WinPcap_4_1_3.exe"; - "USBPcapSetup-1.1.0.0-g794bf26-1.exe"; + "USBPcapSetup-1.1.0.0-g794bf26-3.exe"; ) $Win64Files = @( "WinPcap_4_1_3.exe"; - "USBPcapSetup-1.1.0.0-g794bf26-1.exe"; + "USBPcapSetup-1.1.0.0-g794bf26-3.exe"; ) $Archives = $Win64Archives; |