diff options
| -rw-r--r-- | Makefile.nmake | 156 | ||||
| -rw-r--r-- | config.nmake | 80 | ||||
| -rw-r--r-- | doc/Makefile.nmake | 8 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 8 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 50 | ||||
| -rw-r--r-- | packaging/portableapps/win32/makefile.nmake | 4 | ||||
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 4 |
7 files changed, 130 insertions, 180 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index ee358179d1..a2ce5b1011 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -143,7 +143,7 @@ RESOURCES=image\wireshark.res image\libwireshark.res image\tshark.res \ LIBS_CHECK=_libs_check_ -all: $(LIBS_CHECK) config.h tools image codecs $(ZLIB_DLL) wiretap epan $(EXECUTABLES) $(RESOURCES) doc install-deps +all: $(LIBS_CHECK) config.h tools image codecs $(ZLIB_DLL) wiretap epan $(EXECUTABLES) $(RESOURCES) doc install-all packaging: all cd packaging @@ -173,14 +173,14 @@ packaging_papps: all # use (info-)zip from cygwin to pack things packaging_zip: all !IFDEF MSVCR_DLL - xcopy "$(MSVCR_DLL)" $(INSTALL2_DIR) + xcopy "$(MSVCR_DLL)" $(INSTALL_DIR) !ENDIF !IFDEF VCREDIST_EXE @echo Including vcredist_x86.exe -- your recipient may need to run it! - xcopy "$(VCREDIST_EXE)" $(INSTALL2_DIR) + xcopy "$(VCREDIST_EXE)" $(INSTALL_DIR) !ENDIF rm -f wireshark.zip - zip -r -9 wireshark.zip $(INSTALL2_DIR)/ + zip -r -9 wireshark.zip $(INSTALL_DIR)/ $(RESOURCES): image @@ -190,7 +190,7 @@ wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap wireshark.exe : $(LIBS_CHECK) config.h svnversion.h $(wireshark_OBJECTS) getopt.obj inet_ntop.obj inet_pton.obj codecs epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk\libui.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj inet_ntop.obj inet_pton.obj $(GTK2_LIBS) codecs\codecs.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res + /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj inet_ntop.obj inet_pton.obj $(GTK_LIBS) codecs\codecs.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res << !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1 @@ -514,7 +514,7 @@ codecs:: gtk:: help config.h svnversion.h AUTHORS-SHORT doxygen cd gtk - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib + $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib cd .. epan:: $(RESOURCES) $(ZLIB_DLL) wiretap\wiretap-$(WTAP_VERSION).lib $(BUILT_SOURCES) doxygen @@ -607,18 +607,18 @@ setup: verify_tools clean_setup process_libs # (The choice is determined by the value of the macro WIN32_SETUP_OPT). process_libs: if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS) -!IF "$(GTK2_INST_VERSION)" == "2.12" +!IF "$(GTK_INST_VERSION)" == "2.12" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ glib gtk2.12/glib-2.16.1.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ glib gtk2.12/glib-dev-2.16.1.zip -!ELSEIF "$(GTK2_INST_VERSION)" == "2.10" +!ELSEIF "$(GTK_INST_VERSION)" == "2.10" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ glib gtk2.10/glib-2.12.13.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ glib gtk2.10/glib-dev-2.12.13.zip !ELSE -!ERROR ? Unknown or invalid GTK2_INST_VERSION +!ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF !IFDEF ICONV_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -670,8 +670,8 @@ process_libs: . libsmi-0.4.5.zip !ENDIF -!IFDEF GTK2_DIR -!IF "$(GTK2_INST_VERSION)" == "2.12" +!IFDEF GTK_DIR +!IF "$(GTK_INST_VERSION)" == "2.12" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/gtk+-2.12.9.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -690,7 +690,7 @@ process_libs: gtk2 gtk2.12/tiff-3.8.2-1-bin.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/jpeg-6b-4-bin.zip -!ELSEIF "$(GTK2_INST_VERSION)" == "2.10" +!ELSEIF "$(GTK_INST_VERSION)" == "2.10" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.10/gtk+-2.10.14.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -706,7 +706,7 @@ process_libs: @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.10/libpng-1.2.8-bin.zip !ELSE -!ERROR ? Unknown or invalid GTK2_INST_VERSION +!ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF !IF "$(PANGO_INST_VERSION)" == "1.20" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -776,41 +776,21 @@ clean_setup: ################################################################################ -# generate and install Wireshark GTK2 in INSTALL2_DIR -debug-gtk: wireshark.exe install-files2 - -# generate and install Wireshark GTK2 in INSTALL2_DIR -debug-tshark: tshark.exe - set copycmd=/y - set INSTALL_DIR=$(INSTALL2_DIR) - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-files +# prepare debugging of Wireshark in INSTALL_DIR +debug-wireshark: wireshark.exe install-generated-files -# generate and install Wireshark GTK2 in INSTALL2_DIR -debug-rawshark: rawshark.exe - set copycmd=/y - set INSTALL_DIR=$(INSTALL2_DIR) - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-files +# prepare debugging of tshark in INSTALL_DIR +debug-tshark: tshark.exe install-generated-files -# generate and install Wireshark GTK2 in INSTALL2_DIR -debug-dumpcap: dumpcap.exe +# prepare debugging of rawshark in INSTALL_DIR +debug-rawshark: rawshark.exe install-generated-files +# prepare debugging of dumpcap in INSTALL_DIR +debug-dumpcap: dumpcap.exe install-generated-files -# "install-deps" will copy all files needed to run Wwireshark/Tshark -# to the INSTALL2_DIR, so you can run/debug Wireshark/Tshark from there. - -install-deps: install-deps2 install-files2 - -# install Wireshark GTK2 and other generated files -install-files2: -!IFDEF GTK2_DIR - set INSTALL_DIR=$(INSTALL2_DIR) - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-files - copy wireshark.exe $(INSTALL2_DIR)\wireshark.exe - if exist wireshark.pdb copy wireshark.pdb $(INSTALL2_DIR)\wireshark.pdb - if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL2_DIR) /d -!ENDIF -install-common-files: +# install generated files (exe, "our" libs, ...) +install-generated-files: set copycmd=/y !IF "$(MSVC_VARIANT)" == "MSVC2008EE" xcopy "$(MSVCR_DLL)" $(INSTALL_DIR) @@ -823,6 +803,9 @@ install-common-files: if exist ".\wiretap\wiretap-$(WTAP_VERSION).pdb" xcopy ".\wiretap\wiretap-$(WTAP_VERSION).pdb" $(INSTALL_DIR) /d xcopy ".\epan\libwireshark.dll" $(INSTALL_DIR) /d if exist ".\epan\libwireshark.pdb" xcopy ".\epan\libwireshark.pdb" $(INSTALL_DIR) /d + if exist wireshark.exe copy wireshark.exe $(INSTALL_DIR)\wireshark.exe + if exist wireshark.pdb copy wireshark.pdb $(INSTALL_DIR)\wireshark.pdb + if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL_DIR) /d if exist tshark.exe xcopy tshark.exe $(INSTALL_DIR) /d if exist tshark.pdb xcopy tshark.pdb $(INSTALL_DIR) /d if exist rawshark.exe xcopy rawshark.exe $(INSTALL_DIR) /d @@ -905,67 +888,56 @@ install-common-files: xcopy ".\plugins\wimaxasncp\wimaxasncp.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d if exist custom-install.bat custom-install $(INSTALL_DIR) $(VERSION) -install-deps2: install-common-deps2 -!IFDEF GTK2_DIR +# "install-all" will copy all files needed to run Wireshark/Tshark +# to the INSTALL_DIR, so you can run/debug Wireshark/Tshark from there. +install-all: install-generated-files set copycmd=/y - xcopy $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll $(INSTALL2_DIR) /d - xcopy $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll $(INSTALL2_DIR) /d - xcopy $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll $(INSTALL2_DIR) /d - xcopy $(GTK2_DIR)\bin\libatk-1.0-0.dll $(INSTALL2_DIR) /d - xcopy $(GTK2_DIR)\bin\libpango-1.0-0.dll $(INSTALL2_DIR) /d - xcopy $(GTK2_DIR)\bin\libpangowin32-1.0-0.dll $(INSTALL2_DIR) /d - if not exist $(INSTALL2_DIR)\etc mkdir $(INSTALL2_DIR)\etc - if not exist $(INSTALL2_DIR)\etc\gtk-2.0 mkdir $(INSTALL2_DIR)\etc\gtk-2.0 - if not exist $(INSTALL2_DIR)\etc\pango mkdir $(INSTALL2_DIR)\etc\pango - if not exist $(INSTALL2_DIR)\lib mkdir $(INSTALL2_DIR)\lib - if not exist $(INSTALL2_DIR)\lib\gtk-2.0 mkdir $(INSTALL2_DIR)\lib\gtk-2.0 - if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR) - if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders - if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules - if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines -# if not exist $(INSTALL2_DIR)\lib\pango mkdir $(INSTALL2_DIR)\lib\pango -# if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR) -# if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules - xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* $(INSTALL2_DIR)\etc\gtk-2.0 /d - xcopy $(GTK2_DIR)\etc\pango\pango.* $(INSTALL2_DIR)\etc\pango /d - xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d - xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules /d -# xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d + if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR) + xcopy $(GTK_DIR)\bin\libgdk-win32-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libgdk_pixbuf-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libgtk-win32-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libatk-1.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libpango-1.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libpangowin32-1.0-0.dll $(INSTALL_DIR) /d + if not exist $(INSTALL_DIR)\etc mkdir $(INSTALL_DIR)\etc + if not exist $(INSTALL_DIR)\etc\gtk-2.0 mkdir $(INSTALL_DIR)\etc\gtk-2.0 + if not exist $(INSTALL_DIR)\etc\pango mkdir $(INSTALL_DIR)\etc\pango + if not exist $(INSTALL_DIR)\lib mkdir $(INSTALL_DIR)\lib + if not exist $(INSTALL_DIR)\lib\gtk-2.0 mkdir $(INSTALL_DIR)\lib\gtk-2.0 + if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR) mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR) + if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders + if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules + if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines +# if not exist $(INSTALL_DIR)\lib\pango mkdir $(INSTALL_DIR)\lib\pango +# if not exist $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR) +# if not exist $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules + xcopy $(GTK_DIR)\etc\gtk-2.0\*.* $(INSTALL_DIR)\etc\gtk-2.0 /d + xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d + xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d + xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\im-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules /d +# xcopy $(GTK_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d !IFDEF NEED_LIBPNG_DLL - xcopy $(GTK2_DIR)\bin\libpng13.dll $(INSTALL2_DIR) /d + xcopy $(GTK_DIR)\bin\libpng13.dll $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_LIBTIFF_DLL - xcopy $(GTK2_DIR)\bin\libtiff3.dll $(INSTALL2_DIR) /d + xcopy $(GTK_DIR)\bin\libtiff3.dll $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_LIBJPEG_DLL - xcopy $(GTK2_DIR)\bin\jpeg62.dll $(INSTALL2_DIR) /d + xcopy $(GTK_DIR)\bin\jpeg62.dll $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_CAIRO_DLL - xcopy $(GTK2_DIR)\bin\libcairo-2.dll $(INSTALL2_DIR) /d - xcopy $(GTK2_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL2_DIR) /d + 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 $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) - xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) /d - if not exist $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) mkdir $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) - xcopy "$(GTK_WIMP_RCSRC_DIR)\gtkrc" $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) /d -!ENDIF -!ENDIF - -install-common-deps2: -!IFDEF GTK2_DIR - set INSTALL_DIR=$(INSTALL2_DIR) - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-deps -# This should be moved back to install-common-deps if we ever drop -# GTK+1 support. - xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL2_DIR) /d + 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 - -install-common-deps: - set copycmd=/y - if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR) 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 !IFDEF ICONV_DIR xcopy $(ICONV_DIR)\bin\iconv.dll $(INSTALL_DIR) /d !ENDIF @@ -1003,7 +975,7 @@ install-common-deps: !ENDIF clean-deps: - rm -rf $(INSTALL2_DIR) + rm -rf $(INSTALL_DIR) cd plugins $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps cd .. diff --git a/config.nmake b/config.nmake index 87e1941861..6be2fd3783 100644 --- a/config.nmake +++ b/config.nmake @@ -107,40 +107,29 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.00\nasm.exe # # Mandatory: GLib settings # -# Current versions of GTK+ 1.3 require GLib 2.0. Earlier versions of -# GTK+ 1.3 are buggy; we don't recommend using them, and we don't -# support them. Upgrade to at least GLib 2.0. +# Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x # GLIB_VERSION=2.0 GLIB_DIR=$(WIRESHARK_LIBS)\glib -GLIB_GTK1_HACK_DIR=$(WIRESHARK_LIBS)\glib-gtk1-hack # -# Mandatory: GTK (& related) settings +# Mandatory: GTK (& related libs) settings # -# It's possible, to build both GTK version 1 and 2 at the same time, -# or only one of the versions. GTK version 2 is recommended. +# Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x # -# If you want building with GTK+ 1.3, set GTK1_DIR to the pathname of the -# "gtk+" directory; if you want building with GTK+ 2.x, set GTK2_DIR to -# the pathname of the directory in which the "include" and "lib" directories -# reside. +# If you want building with GTK+, set GTK_DIR to the pathname of the +# directory in which the "include" and "lib" directories reside. # -GTK1_DIR=$(WIRESHARK_LIBS)\gtk+ -GTK2_DIR=$(WIRESHARK_LIBS)\gtk2 +GTK_DIR=$(WIRESHARK_LIBS)\gtk2 # -# Mandatory for GTK >= 2: Version numbers of gtk2 and pango. +# Mandatory: Version numbers of GTK and pango. # # (MAJOR + MINOR Version number but without MICRO version number) # These macros are used by the nsis installer script and by the setup target. # -# GTK 2.10 is the old mainline since Wireshark 0.99.5 -# 0.99.5: PANGO=1.14; 0.99.6: PANGO=1.16 -#GTK2_INST_VERSION=2.10 -#PANGO_INST_VERSION=1.16 # GTK 2.12 is the mainline since Wireshark 0.99.7 -GTK2_INST_VERSION=2.12 +GTK_INST_VERSION=2.12 PANGO_INST_VERSION=1.20 # @@ -468,12 +457,8 @@ COPYCMD=/y ENABLE_LIBWIRESHARK=USE # -# install (debug) directory for Wireshark GTK1 version (relative to your source dir) -INSTALL1_DIR=wireshark-gtk1 - -# -# install (debug) directory for Wireshark GTK2 version (relative to your source dir) -INSTALL2_DIR=wireshark-gtk2 +# install (debug) directory for Wireshark (relative to your source dir) +INSTALL_DIR=wireshark-gtk2 @@ -609,47 +594,40 @@ GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib -# GTK+ 1.3 -GTK1_CFLAGS=$(GLIB_CFLAGS) /I$(GTK1_DIR)\include /I$(GTK1_DIR)\include\gdk \ - /I$(GTK1_DIR)\lib\gtk+\include -GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \ - $(GTK1_DIR)\lib\gdk.lib \ - $(GLIB_LIBS) - -# GTK+ 2.x -GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-2.0 \ - /I$(GTK2_DIR)\lib\gtk-2.0\include \ - /I$(GTK2_DIR)\include\atk-1.0 \ - /I$(GTK2_DIR)\include\cairo \ - /I$(GTK2_DIR)\include\pango-1.0 -GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \ - $(GTK2_DIR)\lib\gdk-win32-2.0.lib \ - $(GTK2_DIR)\lib\gdk_pixbuf-2.0.lib \ - $(GTK2_DIR)\lib\pango-1.0.lib \ +# GTK+ +GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \ + /I$(GTK_DIR)\lib\gtk-2.0\include \ + /I$(GTK_DIR)\include\atk-1.0 \ + /I$(GTK_DIR)\include\cairo \ + /I$(GTK_DIR)\include\pango-1.0 +GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \ + $(GTK_DIR)\lib\gdk-win32-2.0.lib \ + $(GTK_DIR)\lib\gdk_pixbuf-2.0.lib \ + $(GTK_DIR)\lib\pango-1.0.lib \ $(GLIB_LIBS) -!IF "$(GTK2_INST_VERSION)" == "2.12" -GTK2_LIB_DIR=2.10.0 +!IF "$(GTK_INST_VERSION)" == "2.12" +GTK_LIB_DIR=2.10.0 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=$(GTK2_DIR)\lib\gtk-2.0\2.10.0\engines +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=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0 +GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0 GTK_WIMP_RCDST_DIR=etc\gtk-2.0 -!ELSEIF "$(GTK2_INST_VERSION)" == "2.10" -GTK2_LIB_DIR=2.10.0 +!ELSEIF "$(GTK_INST_VERSION)" == "2.10" +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=$(GTK2_DIR)\lib\gtk-2.0\2.10.0\engines +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=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0 +GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0 GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ELSE -!ERROR ? Unknown or invalid GTK2_INST_VERSION +!ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF !IF "$(PANGO_INST_VERSION)" == "1.20" diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake index 8c32a5069b..0cd6f59fb8 100644 --- a/doc/Makefile.nmake +++ b/doc/Makefile.nmake @@ -57,7 +57,7 @@ wireshark.html: wireshark-tmp.pod ../config.h ws.css --noindex \ wireshark-tmp.pod > wireshark.html -../$(INSTALL2_DIR)/tshark.exe: +../$(INSTALL_DIR)/tshark.exe: cd .. $(MAKE) /$(MAKEFLAGS) -f makefile.nmake tshark.exe cd doc @@ -88,10 +88,10 @@ wireshark-filter.html: wireshark-filter.pod ../config.h ws.css --noindex \ wireshark-filter.pod > wireshark-filter.html -wireshark-filter.pod: wireshark-filter.pod.template ../$(INSTALL2_DIR)/tshark.exe +wireshark-filter.pod: wireshark-filter.pod.template ../$(INSTALL_DIR)/tshark.exe cd .. - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-deps - $(INSTALL2_DIR)\tshark.exe -G | $(PERL) doc\dfilter2pod.pl doc\wireshark-filter.pod.template > doc\wireshark-filter.pod + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-all + $(INSTALL_DIR)\tshark.exe -G | $(PERL) doc\dfilter2pod.pl doc\wireshark-filter.pod.template > doc\wireshark-filter.pod $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps cd doc diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 370cc2d69d..bfd20cb2bd 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -13,7 +13,7 @@ UNIX2DOS=$(PERL) ../../tools/unix2dos.pl EXE=../../tshark.exe ../../editcap.exe \ -!IFDEF GTK2_DIR +!IFDEF GTK_DIR ../../wireshark.exe \ !ENDIF ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_0_2.exe @@ -101,9 +101,9 @@ wireshark-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile. !IF "$(ENABLE_LIBWIRESHARK)" != "" /DENABLE_LIBWIRESHARK=$(ENABLE_LIBWIRESHARK) \ !ENDIF -!IFDEF GTK2_DIR - /DGTK2_DIR=$(GTK2_DIR) \ - /DGTK2_LIB_DIR=$(GTK2_LIB_DIR) \ +!IFDEF GTK_DIR + /DGTK_DIR=$(GTK_DIR) \ + /DGTK_LIB_DIR=$(GTK_LIB_DIR) \ /DPANGO_LIB_DIR=$(PANGO_LIB_DIR) \ !IFDEF NEED_LIBPNG_DLL /DNEED_LIBPNG_DLL=$(NEED_LIBPNG_DLL) \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index beed1b1ba0..6f3d09aebb 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -668,41 +668,41 @@ SectionEnd ; "Required" SectionGroup "!Wireshark" SecWiresharkGroup -!ifdef GTK2_DIR -Section "Wireshark GTK2" SecWiresharkGTK2 +!ifdef GTK_DIR +Section "Wireshark" SecWireshark ;------------------------------------------- SetOutPath $INSTDIR File "..\..\wireshark.exe" -File "${GTK2_DIR}\bin\libgdk-win32-2.0-0.dll" -File "${GTK2_DIR}\bin\libgdk_pixbuf-2.0-0.dll" -File "${GTK2_DIR}\bin\libgtk-win32-2.0-0.dll" -File "${GTK2_DIR}\bin\libatk-1.0-0.dll" -File "${GTK2_DIR}\bin\libpango-1.0-0.dll" -File "${GTK2_DIR}\bin\libpangowin32-1.0-0.dll" +File "${GTK_DIR}\bin\libgdk-win32-2.0-0.dll" +File "${GTK_DIR}\bin\libgdk_pixbuf-2.0-0.dll" +File "${GTK_DIR}\bin\libgtk-win32-2.0-0.dll" +File "${GTK_DIR}\bin\libatk-1.0-0.dll" +File "${GTK_DIR}\bin\libpango-1.0-0.dll" +File "${GTK_DIR}\bin\libpangowin32-1.0-0.dll" !ifdef NEED_CAIRO_DLL -File "${GTK2_DIR}\bin\libcairo-2.dll" -File "${GTK2_DIR}\bin\libpangocairo-1.0-0.dll" +File "${GTK_DIR}\bin\libcairo-2.dll" +File "${GTK_DIR}\bin\libpangocairo-1.0-0.dll" !endif !ifdef NEED_LIBPNG_DLL -File "${GTK2_DIR}\bin\libpng13.dll" +File "${GTK_DIR}\bin\libpng13.dll" !endif !ifdef NEED_LIBTIFF_DLL -File "${GTK2_DIR}\bin\libtiff3.dll" +File "${GTK_DIR}\bin\libtiff3.dll" !endif !ifdef NEED_LIBJPEG_DLL -File "${GTK2_DIR}\bin\jpeg62.dll" +File "${GTK_DIR}\bin\jpeg62.dll" !endif SetOutPath $INSTDIR\etc\gtk-2.0 -File "${GTK2_DIR}\etc\gtk-2.0\*.*" +File "${GTK_DIR}\etc\gtk-2.0\*.*" SetOutPath $INSTDIR\etc\pango -File "${GTK2_DIR}\etc\pango\pango.*" -SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders -File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders\libpixbufloader-*.dll" -SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules -File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules\im-*.dll" +File "${GTK_DIR}\etc\pango\pango.*" +SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\loaders +File "${GTK_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\loaders\libpixbufloader-*.dll" +SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\immodules +File "${GTK_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\immodules\im-*.dll" # Not needed with pango 1.14.5 #SetOutPath $INSTDIR\lib\pango\${PANGO_LIB_DIR}\modules -#File "${GTK2_DIR}\lib\pango\${PANGO_LIB_DIR}\modules\pango-*.dll" +#File "${GTK_DIR}\lib\pango\${PANGO_LIB_DIR}\modules\pango-*.dll" SectionEnd @@ -1066,8 +1066,8 @@ SectionEnd ; ============================================================================ !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGroup} "${PROGRAM_NAME} is a GUI network protocol analyzer." -!ifdef GTK2_DIR - !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGTK2} "${PROGRAM_NAME} using the modern GTK2 user interface." +!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 @@ -1105,11 +1105,11 @@ SectionEnd ; ============================================================================ ; Callback functions ; ============================================================================ -!ifdef GTK2_DIR +!ifdef GTK_DIR ; Disable FileExtension if Wireshark isn't selected Function .onSelChange Push $0 - SectionGetFlags ${SecWiresharkGTK2} $0 + SectionGetFlags ${SecWireshark} $0 IntOp $0 $0 & 1 IntCmp $0 0 onSelChange.unselect SectionGetFlags ${SecFileExtensions} $0 @@ -1181,7 +1181,7 @@ lbl_winversion_unsupported_nt4: Quit lbl_winversion_supported: -!ifdef GTK2_DIR +!ifdef GTK_DIR ; Enable GTK-Wimp only for Windows 2000/XP/2003 ; ...as Win9x/ME/NT known to have problems with it! diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index de83cb4f82..64b36731a9 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -65,8 +65,8 @@ pack: distribution -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll - -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\*.dll - -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll + -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\*.dll + -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\*.dll -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\$(GTK_WIMP_DLLDST_DIR)\*.dll !ENDIF diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index ad8b11d6a0..4c30453366 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -86,8 +86,8 @@ pack: distribution !IFDEF UPX -$(UPX) $(UPX_FLAGS) $(DEVICE)\plugins\$(VERSION)\*.dll -$(UPX) $(UPX_FLAGS) $(HOST)\*.dll - -$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\*.dll - -$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll + -$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\*.dll + -$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\*.dll -$(UPX) $(UPX_FLAGS) $(HOST)\$(GTK_WIMP_DLLDST_DIR)\*.dll -$(UPX) $(UPX_FLAGS) $(HOST)\[a-z]*.exe !ENDIF |