forked from osmocom/wireshark
Remove a lot of vestigal GTK-Wimp stuff. It's been included with
GTK+ since version 2.8, when its name was changed to the "GTK MS Windows-Engine." Simplify the Windows installer by removing the GTK-Wimp option (which means the "Wireshark" item can be an entry instead of a group). Move Rawshark to the "Tools" group. (If anyone wants to disable the MS Windows Engine they can still do so after installation by disabling or removing libwimp.dll.) svn path=/trunk/; revision=25611
This commit is contained in:
Gerald Combs
parent
3ac07269e6
commit
72965329b0
|
|
@ -798,10 +798,6 @@ process_libs:
|
|||
!ERROR ? Unknown or invalid PANGO_INST_VERSION
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!IFDEF GTK_WIMP_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk-wimp gtk-wimp/gtk-wimp-0.7.0-bin.zip
|
||||
!ENDIF
|
||||
!IFDEF HHC_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
user-guide user-guide-24665.zip
|
||||
|
|
@ -1011,12 +1007,10 @@ install-all: install-generated-files
|
|||
xcopy $(GTK_DIR)\bin\libcairo-2.dll $(INSTALL_DIR) /d
|
||||
xcopy $(GTK_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL_DIR) /d
|
||||
!ENDIF
|
||||
!IFDEF GTK_WIMP_DIR
|
||||
if not exist $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR)
|
||||
xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) /d
|
||||
if not exist $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR)
|
||||
xcopy "$(GTK_WIMP_RCSRC_DIR)\gtkrc" $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) /d
|
||||
!ENDIF
|
||||
xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d
|
||||
xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d
|
||||
xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d
|
||||
|
|
|
|||
14
config.nmake
14
config.nmake
|
|
@ -131,18 +131,6 @@ GTK_DIR=$(WIRESHARK_LIBS)\gtk2
|
|||
GTK_INST_VERSION=2.12
|
||||
PANGO_INST_VERSION=1.20
|
||||
|
||||
#
|
||||
# If you have GTK-Wimp, set this to the pathname of the directory in
|
||||
# which the files are stored.
|
||||
#
|
||||
# If you don't have GTK-Wimp, comment this line out, so that GTK-Wimp isn't
|
||||
# defined.
|
||||
#
|
||||
# Please note: GTK 2.8 (and later?) includes GTK-Wimp
|
||||
# (in this case these GTK-Wimp related settings will have no effect)
|
||||
#
|
||||
GTK_WIMP_DIR=$(WIRESHARK_LIBS)\gtk-wimp\gtk-wimp-0.7.0-bin
|
||||
|
||||
#
|
||||
# Optional: WinPcap developer's pack to capture network traffic.
|
||||
#
|
||||
|
|
@ -612,7 +600,6 @@ NEED_LIBPNG_DLL=USE
|
|||
NEED_LIBJPEG_DLL=USE
|
||||
NEED_LIBTIFF_DLL=USE
|
||||
NEED_CAIRO_DLL=USE
|
||||
GTK_WIMP_DIR=DUMMY_TO_USE_WIMP
|
||||
GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines
|
||||
GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines
|
||||
GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0
|
||||
|
|
@ -621,7 +608,6 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0
|
|||
GTK_LIB_DIR=2.10.0
|
||||
NEED_LIBPNG_DLL=USE
|
||||
NEED_CAIRO_DLL=USE
|
||||
GTK_WIMP_DIR=DUMMY_TO_USE_WIMP
|
||||
GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines
|
||||
GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines
|
||||
GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0
|
||||
|
|
|
|||
|
|
@ -490,35 +490,6 @@ utilities."
|
|||
</section>
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
<section id="ChLibsWimp">
|
||||
<title>Win32: GTK WIMP (optional) for GTK 2.x only</title>
|
||||
<para>
|
||||
"GTK-Wimp ("Windows impersonator") is a GTK theme that blends well into
|
||||
the Windows desktop environment."
|
||||
</para>
|
||||
<para>
|
||||
GTK-Wimp can be used to get a native Look-and-Feel on WinXP machines,
|
||||
especially with the "coloured" WinXP theme. It will only take effect
|
||||
together with the GTK2 version of Wireshark.
|
||||
</para>
|
||||
<para>
|
||||
No changes to the Wireshark sources are needed, GTK-Wimp simply changes
|
||||
the way GTK2 displays the widgets (by changing the GTK2 default theme).
|
||||
</para>
|
||||
<para>
|
||||
Wimp is available at:
|
||||
<ulink url="http://gtk-wimp.sourceforge.net/"/>.
|
||||
</para>
|
||||
<para>
|
||||
Since GTK version 2.8 the GTK Wimp is included in the GTK releases where
|
||||
it's called "GTK MS Windows Engine" now, so no need to download/install
|
||||
it separately if these versions used.
|
||||
</para>
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
</chapter>
|
||||
<!-- End of WSDG Chapter Libraries -->
|
||||
|
|
|
|||
|
|
@ -199,10 +199,10 @@ update_if(if_dlg_data_t *if_dlg_data, if_stat_cache_t *sc)
|
|||
|
||||
/*
|
||||
* Note that some versions of libpcap, on some versions of UN*X,
|
||||
* pcap_stats() returns the number of packets since the last
|
||||
* pcap_stats() returns the number of packets since the last
|
||||
* pcap_stats call.
|
||||
*
|
||||
* That's a bug, and should be fixed; "pcap_stats()" is supposed
|
||||
* That's a bug, and should be fixed; "pcap_stats()" is supposed
|
||||
* to work the same way on all platforms.
|
||||
*/
|
||||
if (sc) {
|
||||
|
|
@ -643,7 +643,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
|
|||
g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)(HELP_CAPTURE_INTERFACES_DIALOG));
|
||||
|
||||
gtk_widget_size_request(GTK_WIDGET(close_bt), &requisition);
|
||||
/* height + static offset + what GTK-Wimp needs in addition per interface */
|
||||
/* height + static offset + what the GTK MS Windows Engine needs in addition per interface */
|
||||
height += requisition.height + 20 + ifs;
|
||||
gtk_window_set_default_size(GTK_WINDOW(cap_if_w), -1, height);
|
||||
|
||||
|
|
|
|||
|
|
@ -121,13 +121,10 @@ wireshark-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.
|
|||
/DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!IFDEF GTK_WIMP_DIR
|
||||
/DGTK_WIMP_DIR=$(GTK_WIMP_DIR) \
|
||||
/DGTK_WIMP_DLLDST_DIR=$(GTK_WIMP_DLLDST_DIR) \
|
||||
/DGTK_WIMP_DLLSRC_DIR=$(GTK_WIMP_DLLSRC_DIR) \
|
||||
/DGTK_WIMP_RCDST_DIR=$(GTK_WIMP_RCDST_DIR) \
|
||||
/DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \
|
||||
!ENDIF
|
||||
/DGLIB_DIR=$(GLIB_DIR) \
|
||||
!IFDEF ICONV_DIR
|
||||
/DICONV_DIR=$(ICONV_DIR) \
|
||||
|
|
|
|||
|
|
@ -666,9 +666,6 @@ SetShellVarContext all
|
|||
|
||||
SectionEnd ; "Required"
|
||||
|
||||
|
||||
SectionGroup "!Wireshark" SecWiresharkGroup
|
||||
|
||||
!ifdef GTK_DIR
|
||||
Section "Wireshark" SecWireshark
|
||||
;-------------------------------------------
|
||||
|
|
@ -705,21 +702,14 @@ File "${GTK_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\immodules\im-*.dll"
|
|||
#SetOutPath $INSTDIR\lib\pango\${PANGO_LIB_DIR}\modules
|
||||
#File "${GTK_DIR}\lib\pango\${PANGO_LIB_DIR}\modules\pango-*.dll"
|
||||
|
||||
SectionEnd
|
||||
|
||||
!ifdef GTK_WIMP_DIR
|
||||
Section "GTK MS Windows Engine" SecGTKWimp
|
||||
;-------------------------------------------
|
||||
SectionIn 1
|
||||
; GTK MS-Windows Engine (GTK-Wimp)
|
||||
SetOutPath $INSTDIR\${GTK_WIMP_DLLDST_DIR}
|
||||
File "${GTK_WIMP_DLLSRC_DIR}\libwimp.dll"
|
||||
SetOutPath $INSTDIR\${GTK_WIMP_RCDST_DIR}
|
||||
File "${GTK_WIMP_RCSRC_DIR}\gtkrc"
|
||||
SectionEnd
|
||||
!endif
|
||||
!endif
|
||||
|
||||
SectionGroupEnd ; "Wireshark"
|
||||
SectionEnd ; "Wireshark"
|
||||
!endif
|
||||
|
||||
|
||||
Section "TShark" SecTShark
|
||||
|
|
@ -729,13 +719,6 @@ File "..\..\tshark.exe"
|
|||
File "..\..\doc\tshark.html"
|
||||
SectionEnd
|
||||
|
||||
Section "Rawshark" SecRawshark
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR
|
||||
File "..\..\rawshark.exe"
|
||||
File "..\..\doc\rawshark.html"
|
||||
SectionEnd
|
||||
|
||||
SectionGroup "Plugins / Extensions" SecPluginsGroup
|
||||
|
||||
Section "Dissector Plugins" SecPlugins
|
||||
|
|
@ -833,6 +816,13 @@ File "..\..\capinfos.exe"
|
|||
File "..\..\doc\capinfos.html"
|
||||
SectionEnd
|
||||
|
||||
Section "Rawshark" SecRawshark
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR
|
||||
File "..\..\rawshark.exe"
|
||||
File "..\..\doc\rawshark.html"
|
||||
SectionEnd
|
||||
|
||||
SectionGroupEnd ; "Tools"
|
||||
|
||||
!ifdef HHC_DIR
|
||||
|
|
@ -1067,15 +1057,10 @@ SectionEnd
|
|||
; PLEASE MAKE SURE, THAT THE DESCRIPTIVE TEXT FITS INTO THE DESCRIPTION FIELD!
|
||||
; ============================================================================
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGroup} "${PROGRAM_NAME} is a GUI network protocol analyzer."
|
||||
!ifdef GTK_DIR
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecWireshark} "${PROGRAM_NAME} using the GTK user interface."
|
||||
!ifdef GTK_WIMP_DIR
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecGTKWimp} "GTK MS Windows Engine - native Win32 look and feel, for Win2000 and up."
|
||||
!endif
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecWireshark} "${PROGRAM_NAME} is a GUI network protocol analyzer."
|
||||
!endif
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "TShark is a text based network protocol analyzer."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Rawshark is a raw packet filter."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} "Some plugins and extensions for both Wireshark and TShark."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Plugins with some extended dissections."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Plugin for some extended statistics."
|
||||
|
|
@ -1091,6 +1076,7 @@ SectionEnd
|
|||
!insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Text2pcap is a program that reads in an ASCII hex dump and writes the data into a libpcap-style capture file."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Mergecap is a program that combines multiple saved capture files into a single output file"
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Capinfos is a program that provides information on capture files."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Rawshark is a raw packet filter."
|
||||
!ifdef HHC_DIR
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecUsersGuide} "Install the user's guide, so an internet connection is not required to read the help pages."
|
||||
!endif
|
||||
|
|
@ -1183,23 +1169,6 @@ lbl_winversion_unsupported_nt4:
|
|||
Quit
|
||||
|
||||
lbl_winversion_supported:
|
||||
!ifdef GTK_DIR
|
||||
; Enable GTK-Wimp only for Windows 2000/XP/2003
|
||||
; ...as Win9x/ME/NT known to have problems with it!
|
||||
|
||||
;DetailPrint 'Windows Version: $R0'
|
||||
StrCmp $R0 '2000' lbl_select_wimp
|
||||
StrCmp $R0 'XP' lbl_select_wimp
|
||||
StrCmp $R0 '2003' lbl_select_wimp
|
||||
DetailPrint "Windows $R0 doesn't support the GTK MS Windows Engine!"
|
||||
|
||||
Goto lbl_ignore_wimp
|
||||
lbl_select_wimp:
|
||||
!insertmacro SelectSection ${SecGTKWimp}
|
||||
|
||||
lbl_ignore_wimp:
|
||||
!endif
|
||||
|
||||
|
||||
; detect if WinPcap should be installed
|
||||
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 4.0.2"
|
||||
|
|
|
|||
Loading…
Reference in New Issue