diff options
| -rw-r--r-- | Makefile.nmake | 2 | ||||
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.am | 2 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/nsis/WinPcapPage.ini | 2 | ||||
| -rw-r--r-- | packaging/nsis/WinPcap_3_0.exe | bin | 440557 -> 0 bytes | |||
| -rwxr-xr-x | packaging/nsis/WinPcap_3_1_beta4.exe | bin | 0 -> 484652 bytes | |||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 6 |
8 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index c1b58bdc15..ea82d4093e 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -496,7 +496,7 @@ setup: verify_tools !ENDIF !IFDEF GTK_WIMP_DIR @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ - gtk-wimp gtk-wimp/gtk-wimp-0.7.0-bin.zip + gtk-wimp gtk-wimp/gtk-wimp-0.6.2-bin.zip !ENDIF @echo. @echo Ethereal is ready to build. diff --git a/config.nmake b/config.nmake index a2fe6c7aee..9833c6d8de 100644 --- a/config.nmake +++ b/config.nmake @@ -80,7 +80,7 @@ PANGO_INST_VERSION=1.4 # If you don't have GTK-Wimp, comment this line out, so that GTK-Wimp isn't # defined. # -GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp\gtk-wimp-0.7.0-bin +GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp # # If you have Zlib, set this to the pathname of the directory in diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am index ec69028721..89fa2d0c4a 100644 --- a/packaging/nsis/Makefile.am +++ b/packaging/nsis/Makefile.am @@ -8,5 +8,5 @@ EXTRA_DIST = \ servicelib.nsh \ AdditionalTasksPage.ini \ WinPcapPage.ini \ - WinPcap_3_0.exe \ + WinPcap_3_1_beta4.exe \ Makefile.nmake diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 16a068221f..256e51bf28 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -42,7 +42,7 @@ EXE=../../tethereal.exe ../../editcap.exe \ !IFDEF GTK2_DIR ../../ethereal-gtk2.exe \ !ENDIF - ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_3_0.exe + ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_3_1_beta4.exe DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll DOC=../../doc/ethereal.html \ ../../doc/tethereal.html \ diff --git a/packaging/nsis/WinPcapPage.ini b/packaging/nsis/WinPcapPage.ini index 850f53e46a..25b69501e4 100644 --- a/packaging/nsis/WinPcapPage.ini +++ b/packaging/nsis/WinPcapPage.ini @@ -48,7 +48,7 @@ Left=0 Right=150 Top=120 Bottom=135 -Text=WinPcap info at the Ethereal Wiki +Text=What is WinPcap? State=http://wiki.ethereal.com/WinPcap [Field 7] diff --git a/packaging/nsis/WinPcap_3_0.exe b/packaging/nsis/WinPcap_3_0.exe Binary files differdeleted file mode 100644 index df2259f4fe..0000000000 --- a/packaging/nsis/WinPcap_3_0.exe +++ /dev/null diff --git a/packaging/nsis/WinPcap_3_1_beta4.exe b/packaging/nsis/WinPcap_3_1_beta4.exe Binary files differnew file mode 100755 index 0000000000..21d78061b8 --- /dev/null +++ b/packaging/nsis/WinPcap_3_1_beta4.exe diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index e1d1e32ac3..04f4c60eef 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -535,8 +535,8 @@ ExecWait '$WINPCAP_UNINSTALL' $0 DetailPrint "WinPcap uninstaller returned $0" lbl_winpcap_notinstalled: SetOutPath $INSTDIR -File "WinPcap_3_0.exe" -ExecWait '"$INSTDIR\WinPcap_3_0.exe"' $0 +File "WinPcap_3_1_beta4.exe" +ExecWait '"$INSTDIR\WinPcap_3_1_beta4.exe"' $0 DetailPrint "WinPcap installer returned $0" SecRequired_skip_Winpcap: @@ -1060,7 +1060,7 @@ lbl_ignore_wimp: !endif ; detect if WinPcap should be installed - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.0" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.1 beta 4" ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName" IfErrors 0 lbl_winpcap_installed ;if RegKey is available, WinPcap is already installed WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed" |