osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

update various other places, where WinPcap version 4.0.1 was used 

svn path=/trunk/; revision=23431
This commit is contained in:
Ulf Lamping 2007-11-12 07:31:38 +00:00
parent 45989dae89
commit 634b43c3f9
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/nsis/Makefile.am
View File

@ -9,5 +9,5 @@ EXTRA_DIST = \
VersionCompare.nsh \
AdditionalTasksPage.ini \
WinPcapPage.ini \
WinPcap_4_0_1.exe \
WinPcap_4_0_2.exe \
Makefile.nmake

2
packaging/nsis/Makefile.nmake
View File

@ -42,7 +42,7 @@ EXE=../../tshark.exe ../../editcap.exe \
!IFDEF GTK2_DIR
../../wireshark-gtk2.exe \
!ENDIF
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_0_1.exe
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_0_2.exe
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll
DOC=../../doc/wireshark.html \
../../doc/tshark.html \

2
packaging/nsis/wireshark.nsi
View File

@ -1285,7 +1285,7 @@ lbl_winpcap_installed:
; force the user to upgrade by hand
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Flags" "DISABLED"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap 4.0.1, please uninstall $WINPCAP_NAME manually first."
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap 4.0.2, please uninstall $WINPCAP_NAME manually first."
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Flags" "DISABLED"
Goto lbl_winpcap_done

2
packaging/portableapps/win32/WiresharkPortable.ini
View File

@ -9,7 +9,7 @@ WiresharkExecutable=wireshark.exe
AdditionalParameters=
#DisableSplashScreen=false
DisableWinPcapInstall=false
WinPcapInstaller=WinPcap_4_0_1.exe
WinPcapInstaller=WinPcap_4_0_2.exe
# This INI is an example only and will not work until placed according to the directions in readme.txt
# The above options are explained in the included readme.txt

2
packaging/portableapps/win32/WiresharkPortable.nsi
View File

@ -31,7 +31,7 @@
!define DEFAULTEXE "wireshark.exe"
!define DEFAULTAPPDIR "Wireshark"
!define DEFAULTSETTINGSDIR "settings"
!define DEFAULTWINPCAP "WinPcap_4_0_1.exe"
!define DEFAULTWINPCAP "WinPcap_4_0_2.exe"
;=== Program Details
Name "${FULLNAME}"

2
packaging/u3/win32/makefile.nmake
View File

@ -232,7 +232,7 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util
$(COPY) $(TOPDIR)\epan\wslua\console.lua $(DEVICE) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\epan\wslua\dtd_gen.lua $(DEVICE) $(COPY_FLAGS)
!ENDIF
$(COPY) $(TOPDIR)\packaging\nsis\WinPcap_4_0_1.exe $(DEVICE) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\packaging\nsis\WinPcap_4_0_2.exe $(DEVICE) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\cfilters $(DEVICE) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\colorfilters $(DEVICE) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\dfilters $(DEVICE) $(COPY_FLAGS)