Commit Graph

408 Commits

Author SHA1 Message Date
Gerald Combs 76a108ab01 Install the CRT DLLs using the Visual C++ Redistributable Package
(vcredist_x64.exe) on Win64. This should fix bug 4024.

svn path=/trunk/; revision=29977
2009-09-17 21:54:52 +00:00
Gerald Combs f6bab49051 Fix the Freetype DLL name on Win64.
svn path=/trunk/; revision=29972
2009-09-17 15:33:34 +00:00
Anders Broman 35a62e44f9 Try to get the win64 build going.
svn path=/trunk/; revision=29967
2009-09-17 13:49:34 +00:00
Anders Broman 5564468d40 Make the new packet list the default build choice.
svn path=/trunk/; revision=29964
2009-09-17 08:29:10 +00:00
Anders Broman a601aeed88 Use latest GTK suport libs.
svn path=/trunk/; revision=29962
2009-09-17 06:16:24 +00:00
Gerald Combs fcaa314c61 Try to fix the build.
svn path=/trunk/; revision=29952
2009-09-17 01:18:51 +00:00
Anders Broman ef2d9da167 Use the latest GTK packages.
svn path=/trunk/; revision=29943
2009-09-16 13:34:37 +00:00
Kovarththanan Rajaratnam 499695595e Remove superfluous config parameters
svn path=/trunk/; revision=29633
2009-08-30 18:30:14 +00:00
Kovarththanan Rajaratnam 42c0ca3ca7 We require WinPcap > 3.0 so get rid of WPCAP_CONSTIFIED_CONFIG
svn path=/trunk/; revision=29616
2009-08-29 08:19:16 +00:00
Kovarththanan Rajaratnam cfcf299dfe Simplify logic wrt. PANGO_INST_VERSION
svn path=/trunk/; revision=29613
2009-08-29 05:46:45 +00:00
Kovarththanan Rajaratnam f3de3a12a7 Simplify logic wrt. GTK_INST_VERSION
svn path=/trunk/; revision=29612
2009-08-29 05:39:33 +00:00
Kovarththanan Rajaratnam 52183baedd Remove GCC_GLIB_CFLAGS. It isn't being used
svn path=/trunk/; revision=29611
2009-08-29 05:35:50 +00:00
Kovarththanan Rajaratnam 41778c459f Indicate where the some of the macros are used
svn path=/trunk/; revision=29596
2009-08-28 15:59:20 +00:00
Anders Broman e392e77382 Use GTK+ 2.16.5 and Glib 2.20.4.
svn path=/trunk/; revision=29593
2009-08-28 06:21:16 +00:00
Kovarththanan Rajaratnam 5417edcfdc Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead
svn path=/trunk/; revision=29580
2009-08-27 05:04:29 +00:00
Gerald Combs 4c7f40f3f5 Add a compile-time option to use a separate thread for reading from
pipes. Enable this by default on Windows. Remove code that tried to
use WaitForSingleObject on a pipe (which Windows doesn't support). Use
native file handles and system calls on Windows (which fixes a problem
with partial reads I ran into during testing).

This should fix bug 1759.

svn path=/trunk/; revision=29574
2009-08-26 23:16:37 +00:00
Kovarththanan Rajaratnam 10ce541917 Reorder so that mandatory requirements appear in succession
svn path=/trunk/; revision=29560
2009-08-26 07:05:50 +00:00
Kovarththanan Rajaratnam 0dead996a2 win-iconv is statically linked as part of Glib >= 2.14.5, so remove it from config.nmake
svn path=/trunk/; revision=29559
2009-08-26 06:54:48 +00:00
Kovarththanan Rajaratnam 8bc2261d24 Back out r29323. The non fully qualified path seems to work for everyone else so don't mess with it.
svn path=/trunk/; revision=29324
2009-08-07 14:01:44 +00:00
Kovarththanan Rajaratnam cdf7fda658 Use fully qualified path to bash
svn path=/trunk/; revision=29323
2009-08-07 13:18:02 +00:00
Anders Broman e040dac13f Revert change by mistake.
svn path=/trunk/; revision=29201
2009-07-26 22:18:11 +00:00
Anders Broman 3bbe2106c5 From Kovarththanan Rajaratnam:
- Don't issue a row_inserted signal. Rely on our caller to have  
disconnected the model from the view.

-  Removing col_fmt from row_data. It wasn't being used. If we need to store
the column format in the future that should probably be placed in the
PacketList instead of the PacketListRecord
2) Remove double allocation of col_text. Now we allocate it in
new_packet_list_append() and pass it on to packet_list_append_record()
3) Use se_alloc instead of se_alloc0 because we explictly set all the
parameters we use.

svn path=/trunk/; revision=29199
2009-07-26 22:11:46 +00:00
Jeff Morriss bca2a16879 /MP also works with 2008EE
svn path=/trunk/; revision=29116
2009-07-16 12:39:50 +00:00
Anders Broman 67d6f5976e Move th /MP flag setting to LOCAL_CFLAGS set in configure.nmake
for MSVC variant 2008 only. As suggested by Bill Meier.

svn path=/trunk/; revision=29114
2009-07-16 08:27:18 +00:00
Anders Broman 907673a91c Revert checkin made by misstake(don't use new packet list).
svn path=/trunk/; revision=28949
2009-07-06 13:34:30 +00:00
Anders Broman 1415c62c68 Fix:
packet-ndmp.c:562: warning: unused parameter 'pinfo'

svn path=/trunk/; revision=28936
2009-07-03 13:05:45 +00:00
Anders Broman 39139dc75c Sligtly modify Stig's fix, I forgot the makefile change :-(
svn path=/trunk/; revision=28906
2009-07-01 11:40:24 +00:00
Stig Bjørlykke 8324323784 Try to fix HAVE_NEW_PACKET_LIST handling.
svn path=/trunk/; revision=28905
2009-07-01 11:12:58 +00:00
Anders Broman ddad90c3e3 Make it possible to configure use of NEW_PACKET_LIST and fix
one compile error. It still fails in file.c trying to include gtk/gtk.h in new_packet_list.h

svn path=/trunk/; revision=28903
2009-07-01 08:23:32 +00:00
Graeme Lunt 6b64331033 Update to you the latest UPX executable/dll compressor.
svn path=/trunk/; revision=28718
2009-06-13 08:26:11 +00:00
Tomas Kukosa 40cc6f9108 Update to the GnuTLS 2.8.1
svn path=/trunk/; revision=28689
2009-06-10 21:08:01 +00:00
Gerald Combs fffb5f5043 Update the GTK+/GLib libraries.
svn path=/trunk/; revision=28688
2009-06-10 20:58:05 +00:00
Gerald Combs 8adf270b5e Update the GTK+/GLib libraries.
svn path=/trunk/; revision=28686
2009-06-10 18:06:33 +00:00
Gerald Combs 1d0ae8dadb Upgrade to KFW 3.2.2.
svn path=/trunk/; revision=28684
2009-06-10 01:30:49 +00:00
Gerald Combs cdae660d2a Update KFW to 2.6.5.
svn path=/trunk/; revision=28683
2009-06-09 23:54:07 +00:00
Gerald Combs bc469b1f79 Move the trunk to 1.3.
svn path=/trunk/; revision=28495
2009-05-26 20:53:28 +00:00
Tomas Kukosa 0a101aacf6 Make gtk/capture_if_details_dlg_win32.c compileable using MSVC6 with SDK
svn path=/trunk/; revision=28314
2009-05-08 19:53:41 +00:00
Anders Broman b96b6756c9 Use GTK+ 2.16.1-1
svn path=/trunk/; revision=28180
2009-04-27 16:50:58 +00:00
Gerald Combs 2739bf8819 Use the CRT version appropriate for our target architecture.
svn path=/trunk/; revision=28079
2009-04-17 19:02:56 +00:00
Gerald Combs 7b3b6ed3f9 Check for the existence of a couple of directories and add variables for DLL
names.

svn path=/trunk/; revision=28070
2009-04-16 21:34:44 +00:00
Gerald Combs c0ebf76780 Fix (and likely re-break) the Windows builds:
- Use the latest WinPcap Developer's Pack.
  - In file_dlg_win32.c, try to fix Visual C++ 6.0 compilation.
  - #if 0 out a bunch of definitions in capture_if_details_dlg_win32.c
    that already exist in Ntddndis.h.

svn path=/trunk/; revision=28067
2009-04-16 18:14:38 +00:00
Gerald Combs 1c3e3a4a53 Switch back to 1.1.4.
svn path=/trunk/; revision=27810
2009-03-20 23:15:15 +00:00
Gerald Combs ecd732384c Temporarily switch back to building 1.1.3 final.
svn path=/trunk/; revision=27807
2009-03-20 16:17:02 +00:00
Anders Broman db6795dc82 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27796
2009-03-19 06:42:46 +00:00
Gerald Combs 31ea1d7aac Fix the Lua path on Win64.
svn path=/trunk/; revision=27777
2009-03-18 17:05:41 +00:00
Gerald Combs 2d24475011 Move to 1.1.4.
svn path=/trunk/; revision=27767
2009-03-18 05:42:03 +00:00
Anders Broman e7ccbd26d1 Revert the changes, it blows up when resizeing windows...
svn path=/trunk/; revision=27764
2009-03-17 21:33:15 +00:00
Anders Broman 2a6752e050 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27762
2009-03-17 20:21:16 +00:00
Gerald Combs 0d446ae826 Use WIRESHARK_TARGET_PLATFORM instead of PLATFORM.
svn path=/trunk/; revision=27701
2009-03-11 16:13:17 +00:00
Bill Meier a910aed306 gettext library setup: Fix a bug and adjust config slightly for win32 so
gettext setup works the way I think was intended.

svn path=/trunk/; revision=27644
2009-03-07 18:48:25 +00:00
Gerald Combs 2731028a0c Fix Win32 build breakage.
svn path=/trunk/; revision=27634
2009-03-07 03:25:01 +00:00
Gerald Combs 8f69ddeb00 Add preliminary support for Win64 compilation. Attempt to use the same
set of makefiles and scripts for each platform as much as possible.

svn path=/trunk/; revision=27633
2009-03-07 01:06:40 +00:00
Gerald Combs 57dadc4664 More Windows compiler flag cleanups. Fix a problem with my last commit
that would break compilation for older compilers. Create a "DLL_LDFLAGS"
variable and use it in DLLs and plugins. Use PLUGIN_LDFLAGS and
DLL_LDFLAGS where needed. Don't force i386 code in the TPG plugin.

svn path=/trunk/; revision=27582
2009-03-02 21:33:11 +00:00
Gerald Combs 07e5df616e Disable manifest building for our DLLs. This attempts to fix bug 3272.
svn path=/trunk/; revision=27579
2009-03-02 18:57:35 +00:00
Tomas Kukosa fe53605ff9 Update GnuTls to gnutls-2.6.4-1
svn path=/trunk/; revision=27398
2009-02-09 09:38:58 +00:00
Gerald Combs 414d042d2e Change the version to 1.1.3. SVN-stamp the version again.
svn path=/trunk/; revision=27252
2009-01-16 22:35:14 +00:00
Gerald Combs 9b852da8a5 Enable GeoIP if INETSDK is defined (which should mean we have IPv6
definitions even if we're running Visual C++ 6.0).

svn path=/trunk/; revision=27137
2008-12-30 20:05:58 +00:00
Gerald Combs 08364de20d Try to fix a compilation error with Visual C++ 6.0.
svn path=/trunk/; revision=27135
2008-12-30 18:27:34 +00:00
Gerald Combs c30c410fa5 Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_
conversion.

svn path=/trunk/; revision=27098
2008-12-23 18:56:31 +00:00
Gerald Combs c9c32db187 Remove lynx as a dependency on Windows. By default, create the FAQ using
html2text.py. You can override this by adjusting config.nmake or by setting
HTML2TXT.

svn path=/trunk/; revision=27041
2008-12-17 21:11:20 +00:00
Tomas Kukosa 408d562a5c Update GnuTls to gnutls-2.6.3-1
svn path=/trunk/; revision=26998
2008-12-15 11:52:06 +00:00
Gerald Combs e137f6cb76 Use c-ares 1.6.0.
svn path=/trunk/; revision=26961
2008-12-10 22:16:09 +00:00
Bill Meier 94c73a47c9 Compile flags: Use /DWIN32_LEAN_AND_MEAN; Add note re using /MP for faster build
(/MP means "compile multiple source files by using multiple processes")

svn path=/trunk/; revision=26553
2008-10-25 14:33:34 +00:00
Gerald Combs f5b461c34f If PYTHON hasn't been defined, look for Python 2.6, 2.5, and 2.4 (in
that order). If found, set up Python automatically.

svn path=/trunk/; revision=26452
2008-10-14 16:37:47 +00:00
Gerald Combs 193ad40a59 Switch back to 1.1.2.
svn path=/trunk/; revision=26392
2008-10-09 05:07:24 +00:00
Gerald Combs 57a1c7be61 Try for another 1.1.1 development release.
svn path=/trunk/; revision=26374
2008-10-07 21:29:25 +00:00
Anders Broman bc7779c4c4 Use LUA 5.1.4
svn path=/trunk/; revision=26329
2008-10-01 19:38:27 +00:00
Anders Broman b8140ea604 Yet another GTK+ update...
Overview of Changes from GTK+ 2.14.2 to 2.14.3
==============================================

* Revert problematic GtkAdjustment changes

* Bugs fixed: 
 552837 mem leak in gtkimmulticontext
 553000 incorrect i18n header in gtkfilesystem.c
 553135 eog crash: assertion failed
 552545 leaks GpImage

svn path=/trunk/; revision=26273
2008-09-25 20:32:00 +00:00
Gerald Combs 2ed9fdf00e Switch back to normal versioning. Bump the development version to 1.1.2.
svn path=/trunk/; revision=26259
2008-09-24 03:29:21 +00:00
Gerald Combs ba485a4163 Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.

Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.

svn path=/trunk/; revision=26219
2008-09-16 21:08:18 +00:00
Gerald Combs 11171da80f Move to 1.1.1.
svn path=/trunk/; revision=26199
2008-09-15 18:30:51 +00:00
Anders Broman ad54e4ed0e Use GTK+ 2.14.1
What's new in GTK+ 2.14
=======================

GTK+ 2.14 adds new functionality while maintaining source and binary 
compatibility with GTK+ 2.12. Highlights of new features and
improvements in GTK+ 2.14 are:

New widgets and objects

 * GdkAppLaunchContext, provides startup notification with 
   g_app_info_launch()
 * GtkMountOperation, can ask for passwords when mounting 
   volumes with g_volume_mount()
 * GtkToolShell, an interface for containers of GtkToolItems

Noteworthy new APIs
 
 * gtk_show_uri(), a replacement for gnome_vfs_url_show() and
   gnome_url_show()
 * gtk_widget_get_snapshot(), using pixmap redirection to render 
   snapshots of widgets

Changes in the file chooser

 The file chooser uses GIO directly, loadable backends are no longer 
 supported. Autocompletion in the file chooser entry has been improved.

Changes in printing support
 
 The print dialog displays printer status information. Support for
 rearranging pages when printing multiple pages per sheet has been
 added to the cups backend. 

Accessibility support
 
 The gail module is shipped with GTK+, GtkBuilder supports
 accessibility attributes and GtkStatusIcon supports keyboard
 navigation.

Internationalization support

 The compose sequences understood by GTK+'s builtin input method
 have been synchronized with recent X.org compose sequences, adding
 a large number of new sequences. GTK+ no longer uses translations
 when an application is not translated to the current locale.

gdk-pixbuf changes

 * Support loading OS X icns format
 * Support loading JPEG 2000 images
 * Support loading and saving to GIO streams
 * Use GIO for mime information
 
GDK changes

 GDK uses Xrandr instead of Xinerama to provide more (and dynamic)
 monitor information. Font configuration changes are now picked up
 at runtime, without an application restart.

For more details and lists of fixed bugs, see the
announcements for the 2.13.x development releases:

http://mail.gnome.org/archives/gtk-devel-list/2008-February/msg00079.html
http://mail.gnome.org/archives/gtk-devel-list/2008-May/msg00112.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00033.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00158.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00044.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00182.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00023.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00153.html

svn path=/trunk/; revision=26148
2008-09-06 15:25:23 +00:00
Gerald Combs 56c7f5b643 Move the trunk to 1.1.0. Temporarily build a non-SVN-stamped package, so
that we can build 1.1.0 packages.

svn path=/trunk/; revision=26136
2008-09-04 19:37:16 +00:00
Gerald Combs 1930d5cad3 More updates to allow for a win64 target build.
svn path=/trunk/; revision=26029
2008-08-14 23:56:57 +00:00
Gerald Combs 837f0d9d53 SecFileExtensions was removed in 2005. Don't reference it. Fixes bug 2793.
Replicate the old SecFileExtensions behavior by disabling and unchecking
the file extensions option when Wireshark is unselected.

While we're at it, add a "PLATFORM" variable to config.nmake, and use
it to set the library directory and installer filename and title.

Add a couple of minor fixes.

svn path=/trunk/; revision=26019
2008-08-14 17:54:35 +00:00
Gerald Combs 5906f69b88 On Windows, if we're running anything but plain Visual C++ 6 (including
VC6 plus a platform SDK), set INET6. Use that to figure out if we need
to define socklen_t for c-ares. This should fix bug 2797.

svn path=/trunk/; revision=25985
2008-08-11 21:59:59 +00:00
Gerald Combs ce6607a9dd Add a note about c-ares and MSVC6.
svn path=/trunk/; revision=25982
2008-08-11 17:20:18 +00:00
Gerald Combs 021a926793 Add support for the c-ares asynchronous DNS resolution library to the
Windows build. Add support for async IPv6 lookups. Update the ADNS
code slightly.

This is not supported (yet) on the UNIX side.

svn path=/trunk/; revision=25953
2008-08-07 21:41:48 +00:00
Gerald Combs 10260fb76b Switch the default MSVC_VARIANT from MSVC6 to MSVC2008.
svn path=/trunk/; revision=25932
2008-08-05 17:02:30 +00:00
Gerald Combs 7d8e29f501 From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.
From me:

Instead of adding adns_config.h, place it a custom adns package in
wireshark-win32-libs. Update tools/win32-setup.sh accordingly.

Split the MSVC2008EE variant into MSVC2008 and MSVC2008EE, similar to
MSVC2005 and MSVC2005EE. We have to worry about vcredist_x86.exe in
both cases.

Add Pascal to AUTHORS.

Update the Developer's Guide.

svn path=/trunk/; revision=25921
2008-08-04 23:05:32 +00:00
Gerald Combs 72965329b0 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
2008-06-26 16:42:07 +00:00
Gerald Combs 48c21706f2 Add TurboCap-related changes from /trunk-1.0:
From Dustin Johnson: Add support for TurboCap.
  - packet-ppi.c: Add aggregation and 802.3 extended information.
  - capture-wpcap.c: Add support for pcap_list_datalinks and pcap_set_datalink.

Make pcap_list_datalinks and pcap_set_datalink mandatory on Windows.

svn path=/trunk/; revision=25593
2008-06-24 21:16:22 +00:00
Tomas Kukosa b202c984e3 Update GnuTls to gnutls-2.3.8-1
svn path=/trunk/; revision=25309
2008-05-16 06:53:15 +00:00
Tomas Kukosa a1d164a5da Update to Portaudio pa_stable_v19_20071207
svn path=/trunk/; revision=25285
2008-05-13 07:39:23 +00:00
Tomas Kukosa 27ccd63ce7 Update to WpdPack 4.0.2 and NASM 2.02
svn path=/trunk/; revision=25278
2008-05-12 19:13:55 +00:00
Tomas Kukosa 73ae498dd0 Enable PCAP_REMOTE by default
svn path=/trunk/; revision=25252
2008-05-07 13:15:24 +00:00
Anders Broman a0866910ef Use Libsmi 0.4.8
svn path=/trunk/; revision=25147
2008-04-22 19:28:44 +00:00
Ulf Lamping 2e505267a8 as we can't easily (re)build adns on msvc6, create and use compiler specific dirs (e.g. MSVC2005EE/adns) to place the compiler specific dll/lib files into
svn path=/trunk/; revision=25000
2008-04-13 21:21:25 +00:00
Ulf Lamping f2012542c0 attempt to build ADNS on none MSVC6 systems - with the same mechanism as done with ZLIB
Unfortunately, both dep and rc files need to be patched, so I added the patched files

It's an ugly solution but it seems to work ...

svn path=/trunk/; revision=24996
2008-04-13 17:58:04 +00:00
Ulf Lamping 22045b4a54 lot's of GTK1 related code cleanup in the Win32 build process
svn path=/trunk/; revision=24854
2008-04-09 03:48:16 +00:00
Anders Broman 533063e063 Use the latest GTK libraries.
svn path=/trunk/; revision=24711
2008-03-21 16:15:21 +00:00
Gerald Combs d4ba88b677 Use libgmodule-2.0-0.dll 2.14.5 for the GTK+1 version of Wireshark.
svn path=/trunk/; revision=24703
2008-03-20 00:30:47 +00:00
Gerald Combs 55b798b353 Bump the version in the trunk to 1.0.99 (which will become 1.1.0 at some
point).

svn path=/trunk/; revision=24676
2008-03-17 23:01:20 +00:00
Gerald Combs b14bd744d3 The trunk is now 0.99.9.
svn path=/trunk/; revision=24379
2008-02-18 19:58:46 +00:00
Gerald Combs 7abeb02747 If we have an SVN revision number, use it as the build number under Windows
instead of "0".

svn path=/trunk/; revision=24376
2008-02-18 18:08:14 +00:00
Bill Meier 69a44d1cb8 Clean-up: remove obsolete references to GTK libraries, ETHEREAL_EUG_DIR, etc
svn path=/trunk/; revision=24365
2008-02-16 21:07:19 +00:00
Anders Broman 363524d728 Use gtk+ 2.12.8 glib 2.12.6-2 and pcre 7.0.
( Problem seemed to be with pxbuffloaders).

svn path=/trunk/; revision=24357
2008-02-16 16:35:49 +00:00
Bill Meier 57c4bec6c2 Clarify wording slightly ....
svn path=/trunk/; revision=24331
2008-02-14 17:24:14 +00:00
Bill Meier 718b14c7ce Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
2008-02-14 17:16:12 +00:00
Stig Bjørlykke 7715fe8c8c Use the new gettext-runtime.
svn path=/trunk/; revision=24217
2008-01-28 20:23:08 +00:00