osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Revert back to GTK-Wimp 0.6.2. Move to WinPcap 3.1beta4. 

svn path=/trunk/; revision=15091
This commit is contained in:
Gerald Combs 2005-07-26 16:44:57 +00:00
parent 90a1127ba1
commit a64a4043c3
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.nmake
View File

@ -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.

2
config.nmake
View File

@ -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

2
packaging/nsis/Makefile.am
View File

@ -8,5 +8,5 @@ EXTRA_DIST = \
servicelib.nsh \
AdditionalTasksPage.ini \
WinPcapPage.ini \
WinPcap_3_0.exe \
WinPcap_3_1_beta4.exe \
Makefile.nmake

2
packaging/nsis/Makefile.nmake
View File

@ -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 \

2
packaging/nsis/WinPcapPage.ini
View File

@ -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]

BIN
packaging/nsis/WinPcap_3_0.exe
View File

Binary file not shown.

BIN
packaging/nsis/WinPcap_3_1_beta4.exe Executable file
View File

Binary file not shown.

6
packaging/nsis/ethereal.nsi
View File

@ -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"