Commit Graph

508 Commits

Author SHA1 Message Date
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
Anders Broman 6fbf8be77d Build with assembler support (NASM).
svn path=/trunk/; revision=23947
2007-12-25 15:55:19 +00:00
Guy Harris 947e70b4b7 Delete the *right* config.h.win32.
Copy the MSVC++-version-checking stuff from it into the top-level
config.h.win32, and try to set up config.nmake so that MSC_VER_REQUIRED
is defined in all Makefiles that include config.nmake.

svn path=/trunk/; revision=23802
2007-12-07 23:58:46 +00:00
Tomas Kukosa 08bbd29c71 Support for RPCAP features in GUI (from Boris Misenov, see Bug 1366)
- retrieving the list of remote PCAP interfaces
  - password authentication support
  - UDP data fransfer
  - packet sampling (available in WinPcap 4.x)
  etc.

fix problem if non-default rpcap port is used

svn path=/trunk/; revision=23750
2007-12-04 11:19:29 +00:00
Ulf Lamping 99d60cce59 first steps to support MSVC 2008 Express Edition
svn path=/trunk/; revision=23691
2007-11-30 22:01:05 +00:00
Anders Broman 26c07ee766 Update to gtk+ 2.14.2 and glib glib-2.14.4
svn path=/trunk/; revision=23674
2007-11-29 21:34:38 +00:00
Anders Broman aeb3263d8f Add a link to NASM
svn path=/trunk/; revision=23652
2007-11-28 21:33:01 +00:00
Bill Meier 7f9585782d Fixes for Windows build w/o ZLIB
svn path=/trunk/; revision=23651
2007-11-28 20:06:21 +00:00
Tomas Kukosa ff7c20938e Various changes with focus to startup speedup
The startup timeout on Win32 is reduced to 80% without assembler and to 50% with assembler usage (which is optional)
proto.c
 - do not look up in filed tree and inserts in two steps but do it at once
 - next few small speedups
 - some often called elementary functions can be optionally implemented in assembler
 - dispart some functions to see more exact result from profiling
packet-tpnc.c
 - do not reallocate memory for each filed

svn path=/trunk/; revision=23643
2007-11-28 10:18:16 +00:00
Graeme Lunt 24f27a48ec Support for the automatic configuration of the UPX dll/exe packer.
config.nmake - default UPX to the downloaded version in $WIRESHARK_LIBS
win32-setup.sh - updated to also add executables bit to exes - and also use new tag
Makefile.nmake - to download UPX (and also use new version of user-guide)


svn path=/trunk/; revision=23562
2007-11-24 11:45:51 +00:00
Gerald Combs 7a4d6fbf36 Bump the trunk to 0.99.8.
svn path=/trunk/; revision=23525
2007-11-21 00:09:38 +00:00
Graeme Lunt 04b798cbf4 Update to optionally use the "Ultimate Packer for eXecutables" (UPX) to pack the exes and dlls prior to U3 and PortableApps packaging.
For the U3 package, this results in a 40% smaller package.
For the PortableApps version, the package size is not much different, but the install time is quicker. 


svn path=/trunk/; revision=23484
2007-11-18 10:20:26 +00:00
Tomas Kukosa 6055995bf1 revert changes in config.nmake committed by mistake and commit configure.in
svn path=/trunk/; revision=22996
2007-09-27 08:33:53 +00:00
Tomas Kukosa 706e13b44d put next few simple ASN.1 dissectors into the new makefile structure
svn path=/trunk/; revision=22994
2007-09-27 06:03:45 +00:00
Anders Broman 6b4a7ba74d Use GTK+ 2.12
svn path=/trunk/; revision=22955
2007-09-25 16:09:58 +00:00
Jörg Mayer 094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Ulf Lamping 7f299f9bcf remove comment which compiler version works - they all work
svn path=/trunk/; revision=22798
2007-09-05 23:03:58 +00:00
Ulf Lamping a8d0136ed8 always compile zlib.dll from source (even on MSVC6 now), this simplifies the makefiles a bit and (more important) removes an annoying behaviour if you switch between compiler versions - you'll need to run the setup target each time you switch
svn path=/trunk/; revision=22714
2007-08-28 20:31:48 +00:00
Anders Broman c2c385fc9f Minor tweeks.
svn path=/trunk/; revision=22674
2007-08-26 21:01:13 +00:00
Anders Broman ef9971610c Use config and makefile from Chris Maynard and Luis instead.
svn path=/trunk/; revision=22672
2007-08-26 20:03:23 +00:00
Anders Broman d4e158db74 Download libsmi
svn path=/trunk/; revision=22671
2007-08-26 19:17:03 +00:00
Gerald Combs ad56f2ee36 0.99.6 has been split off. Bump the trunk to 0.99.7.
svn path=/trunk/; revision=22111
2007-06-15 18:44:43 +00:00
Gerald Combs b713a968bd Revert back to having a local copy of airpcap.h. This should fix building
with AirPcap.  Re-define AIRPCAP_DIR.

svn path=/trunk/; revision=21846
2007-05-20 22:32:14 +00:00
Anders Broman 001d89c183 Undefine AIRPCAP_DIR to get the Windows build going again.
svn path=/trunk/; revision=21841
2007-05-20 19:55:34 +00:00
Gerald Combs 55d2b928c2 From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
    some related upcoming code changes.
  - Remove airpcap.h from the repository, since it exists in the AirPcap
    devpack (and will be superseded Real Soon Now).
  - Show the individual channel flag bits in radiotap.
  
Fix the 802.11n MCS set display.

This is a partial checkin, so hopefully nothing is broken.

svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Anders Broman 4c92cbef0e Use the latest GTK stuff.
svn path=/trunk/; revision=21122
2007-03-22 22:26:59 +00:00
Ulf Lamping 90a418243c Python V2.5 is the latest stable version. Add a comment to config.nmake (but keep the 2.4 alive for now) and update version strings in the devel guide.
If the buildbot will be updated, we could also activate the new version in config.nmake.

svn path=/trunk/; revision=20750
2007-02-08 18:25:45 +00:00
Ulf Lamping 77dd618f96 some minor cleanup
svn path=/trunk/; revision=20702
2007-02-03 20:57:24 +00:00
Ulf Lamping 591611ff4e as discussed on the list:
- GTK 2.10 is mainline now
- WINPCAP_VERSION is just confusing without benefit, remove it

svn path=/trunk/; revision=20701
2007-02-03 20:40:11 +00:00
Ulf Lamping 6060578121 ... no it won't, that's why I removed them ...
Put the quotes around the places where HHC_DIR is used, that should work.

svn path=/trunk/; revision=20699
2007-02-03 19:37:59 +00:00
Bill Meier 07ab8a268b Quotes around HHC_DIR required so build doesn't fail;
Will the buildbot "build docs" step work ? Let's see

svn path=/trunk/; revision=20698
2007-02-03 19:33:32 +00:00
Ulf Lamping acaa675c25 fix HHC_DIR to work
svn path=/trunk/; revision=20693
2007-02-03 07:54:18 +00:00
Ulf Lamping f95f5a5437 cleanup docbook related comments
svn path=/trunk/; revision=20692
2007-02-03 05:13:39 +00:00
Ulf Lamping 34c0a4447c move docbook related settings from docbook/Makefile.nmake to config.nmake - having only one place to configure it all :-)
svn path=/trunk/; revision=20690
2007-02-03 04:06:43 +00:00
Ulf Lamping b7eca1050c fix a cut-n-paste error, to fix buildbot problem
svn path=/trunk/; revision=20645
2007-01-31 04:34:58 +00:00
Ulf Lamping 5698c994ca C preprocessor only handles integers for conditional compilation. Build MSC_VER_REQUIRED in config.nmake and compare it with _MSC_VER in config.h.win32
svn path=/trunk/; revision=20637
2007-01-31 02:23:06 +00:00
Gerald Combs 9f8fa9cfe2 Bump the trunk version to 0.99.6.
svn path=/trunk/; revision=20526
2007-01-22 22:57:32 +00:00
Ulf Lamping 852551cd86 user-guide final step:
enable HHC_DIR as default, hopefully the buildbot will "get it right" now :-)

svn path=/trunk/; revision=20496
2007-01-19 01:21:17 +00:00
Ulf Lamping 2d760bf075 in effect use the User's Guide as the online help system now (for GTK > V1)!
remove ENABLE_WSUG setting from config.nmake and replace it with GLIB_MAJOR_VERSION >= 2 (as Glib 1.x cannot open a browser to show a HTML file - it's just currently? not implemented)

svn path=/trunk/; revision=20446
2007-01-16 04:08:35 +00:00
Ulf Lamping 13a095e055 no, we're still not using MSVC2005 as default :-(
should fix the Win32 buildbot ...

svn path=/trunk/; revision=20413
2007-01-13 04:28:26 +00:00
Ulf Lamping 19bd3956a2 fix some remaining MSVC != V6 issues:
- add redistributables (msvcr*.dll) to the NSIS installer (depending on MSVC_VARIANT)
- split MSVC2006 and MSVC2006EE (Express Edition) settings in config.nmake, as redistributable settings for NSIS are different
- remove Platform SDK setting from config.nmake, it's not needed

svn path=/trunk/; revision=20411
2007-01-13 00:59:39 +00:00
Ulf Lamping ab31b4fa4d add the ".NET Framework SDK V1.0" to the list of working MSVC_VARIANTS :-)
svn path=/trunk/; revision=20390
2007-01-11 07:53:01 +00:00
Ulf Lamping dab6935453 various msvc / zlib config cleanup
svn path=/trunk/; revision=20383
2007-01-10 21:45:19 +00:00
Ulf Lamping 393537a7f8 fix the HHC_DIR settings for none MSVC6 variants
svn path=/trunk/; revision=20375
2007-01-10 09:56:39 +00:00
Ulf Lamping 49fd1e07c8 from Laurent Rabret:
use /MD switch instead of direct linker switches
(hopefully this will fix linker issues mentioned by Andrew and Stephen)

svn path=/trunk/; revision=20370
2007-01-10 03:11:13 +00:00
Ulf Lamping e71b416608 fix compilation for:
- Visual Studio .NET (2002)
- Visual Studio .NET 2003

svn path=/trunk/; revision=20349
2007-01-08 22:29:18 +00:00
Ulf Lamping 7a7c7ea302 Oops, I did it again ;-)
C:\Programme -> C:\Program Files

svn path=/trunk/; revision=20339
2007-01-08 03:31:28 +00:00
Ulf Lamping e456b4fcd6 if we don't have MSVC6, download (using the setup target) the zlib source package instead of the dll one, and compile it in a temp dir before continuing with wiretap
svn path=/trunk/; revision=20337
2007-01-08 02:40:06 +00:00
Ulf Lamping 8fb030d900 fix GNUTLS compiling issue on recent MSVC versions by switching off Wincrypt.h, see: http://www.mail-archive.com/openssl-dev@openssl.org/msg03802.html for details
svn path=/trunk/; revision=20336
2007-01-07 19:50:16 +00:00
Ulf Lamping cc164653a0 add experimental support for some more of the MSVC_VARIANTs:
- Microsoft .Net Framework SDK Version 1.1
- Microsoft .Net Framework 2.0 SDK
... which seems to work fine now (except for the open problems like zlib) :-)

Some of the plugins need different linker flags depending on the MSVC. I've set a "define" in config.nmake (PLUGIN_LDFLAGS) and used it in the affected plugins/.../Makefile.nmake. Maybe we should generally change the plugins that way.

btw: The "Microsoft Visual C++ Toolkit 2003" (mentioned some time ago on the list) doesn't work as some important files are missing - and we have much easier alternatives now :-)

svn path=/trunk/; revision=20332
2007-01-06 01:05:59 +00:00
Ulf Lamping 1a25d263d6 don't spread the AirPcap DevPack files over the libs dir, unzip files into: AirPcap_Devpack_1_0_0_594
svn path=/trunk/; revision=20324
2007-01-05 05:23:02 +00:00
Ulf Lamping 3a1a07c46a compile error in openssl.h depends on the Platform SDK, not the MSVC variant used
change the !IFDEF around GNUTLS accordingly

svn path=/trunk/; revision=20323
2007-01-05 05:03:15 +00:00
Ulf Lamping b6fd719414 move the directory settings more to the top, add an optional platform SDK setting
svn path=/trunk/; revision=20322
2007-01-05 04:58:52 +00:00
Gerald Combs 7d0118ff10 Update to the latest Win32 libs: Net-SNMP 5.4 and GNUTLS 1.6.1. Enable
AirPcap.

svn path=/trunk/; revision=20321
2007-01-05 01:35:23 +00:00
Ulf Lamping ba961e3ba8 add the "Microsoft .Net Framework SDK Version 1.1" as a compiler option (this is the one described in the corresponding Wiki page)
mark "Visual Studio 2005" (without Express) as EXPERIMENTAL too, seems to be working just like the Express Edition :-)

svn path=/trunk/; revision=20313
2007-01-04 20:51:18 +00:00
Ulf Lamping d736a37664 another attempt to fix the "Program Files" setting. Unfortunately, using the environment setting doesn't seem to work ...
svn path=/trunk/; revision=20297
2007-01-03 22:09:15 +00:00
Ulf Lamping 97df0c4a56 hmmm, maybe he don't like mixing slashes and backslashes ...
svn path=/trunk/; revision=20292
2007-01-03 06:41:17 +00:00
Ulf Lamping 59cebb950f remove the PDB_FILE setting from config.nmake - there's no real need for this info
add some missing files to the clean targets

svn path=/trunk/; revision=20290
2007-01-03 05:41:11 +00:00
Ulf Lamping 17d57d538c Instead of hard coding "C:/program files", use the corresponding environment variable %ProgramFiles% (hopefully this is available on all supported platforms). This makes it possible to use the same unchanged setting even for internationalised Windows versions (e.g. in the german version this is: "C:\Programme")
svn path=/trunk/; revision=20288
2007-01-03 04:28:28 +00:00
Ulf Lamping 15fd728985 move the MSVC "block" towards the top of the file
don't use GNUTLS and ZLIB when compiling with MSVC != Version 6 - it currently doesn't work

svn path=/trunk/; revision=20283
2007-01-03 02:53:30 +00:00
Ulf Lamping 578e62131e make MSVC6 the default for MSVC_VARIANT, not MSVC2005
svn path=/trunk/; revision=20265
2007-01-02 13:05:04 +00:00
Ulf Lamping 6bb21fbafd first MSVC 2005 changes:
- add some lines to set the desired MSVC_VARIANT
- set some defines (to prevent tons of "deprecated" warnings)
- set some linker flags (currently don't know if these are the right ones - still experimenting)

svn path=/trunk/; revision=20258
2007-01-02 01:19:40 +00:00
Anders Broman 0e063dc29c Use portaudio v19.
svn path=/trunk/; revision=20225
2006-12-27 22:21:46 +00:00
Bill Meier 81ab78cddb Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;
I violated Murphy's nth law: thou shalt test fixes in an 
'out of the box' configuration *not* in one's customized configuration.
:(


svn path=/trunk/; revision=20221
2006-12-26 22:40:49 +00:00
Ulf Lamping a672d53330 cygwins python doesn't work on a lot of machines, make the native python the default (until we know what the cause of the problems are)
set VERSION_EXTRA back to empty - I guess this was checked in by mistake

svn path=/trunk/; revision=20218
2006-12-26 20:20:52 +00:00
Gerald Combs b90006ac6f Update to GNUTLS 1.6.0.
svn path=/trunk/; revision=20204
2006-12-23 00:06:16 +00:00
Anders Broman 686b41801c Update to use gtk 2.10.6 and friends.
svn path=/trunk/; revision=20188
2006-12-21 22:15:34 +00:00
Jörg Mayer e26860607d Get rid of UCD SNMP support (it's not longer supported and
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.


svn path=/trunk/; revision=20071
2006-12-08 15:05:41 +00:00
Gerald Combs 8e397a2617 Don't define HAVE_AIRPDCAP if HAVE_AIRPCAP isn't defined. Fix a compiler
warning in the 802.11 dissector.

svn path=/trunk/; revision=20053
2006-12-06 20:29:54 +00:00
Bill Meier bf209eec73 Use 'igncr' as needed with Bash (workaround for bug report 1162);
Change usage of 'nmake' to $(MAKE) /$(MAKEFLAGS) in a few places;
Add one missing /$(MAKEFLAGS);


svn path=/trunk/; revision=20034
2006-12-04 05:41:53 +00:00
Anders Broman 09bd61c233 Update to use the latest gtk 2.8 glib and pango libraries.
Note from a mail on gtk dev list:
-rwxr-xr-x    1 tml      Administ   224510 Oct  3 18:35 libpango-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    37952 Oct  3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    58749 Oct  3 18:35 libpangowin32-1.0-0.dll

(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)

svn path=/trunk/; revision=19880
2006-11-12 22:18:50 +00:00
Ulf Lamping 59d6c8ea33 change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.
Please distclean Win32 builds!

svn path=/trunk/; revision=19814
2006-11-05 22:46:44 +00:00
Gerald Combs a076a8731d Bump the version to 0.99.5.
svn path=/trunk/; revision=19781
2006-11-03 06:55:30 +00:00
Ulf Lamping 15260339d7 change the default GTK version from GTK2.6 to GTK2.8
svn path=/trunk/; revision=19728
2006-10-29 14:41:16 +00:00
Ulf Lamping 826b611290 fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO

svn path=/trunk/; revision=19715
2006-10-27 12:06:13 +00:00
Anders Broman 0880bc54d0 Preparations for using the latest GTK 2.8 files for now only gettext is updated.
svn path=/trunk/; revision=19695
2006-10-26 07:25:07 +00:00
Jörg Mayer 926ed8aa01 Alejandro Vaquero:
Add portaudio v19 support in addition to v18:

   Here is a patch using the API 2 (v19). I tested it only in Windows.
Attached also the Windows v19 zip file used. I did not modify the
Makefile.nmake to download this new version (when running the "setup"),
because Windows v18 it is still good.


svn path=/trunk/; revision=19446
2006-10-07 14:24:32 +00:00
Gerald Combs 2649d26145 Fix WEP key bug in the AirPcap code that could cause a crash. Enable
AirPcap by default. Add initial support for the "Any" device in AirPcap
(more to come).

svn path=/trunk/; revision=19401
2006-10-02 23:44:10 +00:00
Gerald Combs 0678c4f7c4 Update GNUTLS to 1.5.1. This includes an updated libgcrypt, which should
fix bug 1096.

Switch back to fetching a date-stamped URL in win32-setup.sh.  This
ensures backward compatibility with previous releases and non-updated
SVN trees.

svn path=/trunk/; revision=19339
2006-09-27 18:02:40 +00:00
Luis Ontanon 354983d30d use luaforge's 5.1 dll to be able to link on windows. fix some mistakes
svn path=/trunk/; revision=19331
2006-09-27 00:45:55 +00:00
Luis Ontanon c8a95a0548 Lua 5.1.1 for windows
svn path=/trunk/; revision=19324
2006-09-26 03:31:00 +00:00
Ulf Lamping 3fa7bc5f0c change the Win32 build environment, so we can create release zip files without the need of an installer - a feature requested from time to time. When this is matured, we might want to add these zip files (of GTK1 and GTK2 versions) to the released files.
config.nmake contains the target INSTALL1_DIR and INSTALL2_DIR. I guess you can retain the previous behaviour by using . for both DIRs, though I never tested this...

svn path=/trunk/; revision=19302
2006-09-23 01:39:07 +00:00
Ulf Lamping 1048fafb27 so it's HAVE_LIBPORTAUDIO
svn path=/trunk/; revision=19228
2006-09-13 11:28:36 +00:00
Ulf Lamping edae542c06 it's HAVE_PORTAUDIO, not HAVE_LIBPORTAUDIO
svn path=/trunk/; revision=19215
2006-09-12 17:45:43 +00:00
Ulf Lamping 04fe34d711 various nmake related build file cleanups
svn path=/trunk/; revision=19198
2006-09-12 00:27:03 +00:00
Ulf Lamping 9fee393b87 tweak the nmake build so the NET-SNMP library is in fact optional (as it is in the UNIX builds)
svn path=/trunk/; revision=19196
2006-09-11 22:47:57 +00:00
Ulf Lamping 1d1f904321 let the user only specify the PortAudio version and do the "ugly details" in the part below, just as we do it for most other libs
svn path=/trunk/; revision=19195
2006-09-11 22:43:00 +00:00
Anders Broman a1f8b7e084 From Alejandro Vaquero:
Need to use HAVE_LIBPORTAUDIO instead 
of PORTAUDIO_DIR in voip_calls.c

And build the windows version with Port audio.

svn path=/trunk/; revision=19187
2006-09-10 18:03:22 +00:00
Anders Broman 5534f7472b Add comments about PORTAUDIO API version comment out use of PORTAUDIO library for now.
svn path=/trunk/; revision=19161
2006-09-06 05:23:38 +00:00
Anders Broman 1129da54e8 Handle PORTAUDIO_API_1 and add clean-deps target to distclean.
svn path=/trunk/; revision=19159
2006-09-05 20:35:41 +00:00
Ulf Lamping f274a56104 a huge redesign of the settings in config.nmake
most changes are related to comments and the sequence of the settings, so by comparing the old and the new file, any merge conflicts will be hopefully easily resolved at least manually.

svn path=/trunk/; revision=19098
2006-08-31 01:50:11 +00:00
Ulf Lamping 9ffebf10bd remove the MAKENSIS_MODERN_UI, as the modern UI of NSIS is very stable now so there's no need for this setting any longer (removing some unnecessary complexity)
svn path=/trunk/; revision=19097
2006-08-30 23:27:37 +00:00
Anders Broman 7eac3c2879 From Alejandro Vaquero:
- Change the "listen_rtp" to "rtp_player"
- Change from a plugin to be part of the core
- By default it will not compile with the rtp_player. In order to 
compile it is necessary to:
       + For windows: uncomment the line 
"PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1" in config.nmake
       + For linux: using the "--with-portaudio=yes"

svn path=/trunk/; revision=19094
2006-08-30 21:51:31 +00:00
Gerald Combs 52e5d6bb19 Bump the version to 0.99.4.
svn path=/trunk/; revision=19014
2006-08-24 16:23:32 +00:00
Ulf Lamping 513649aad0 rollback some IMO unintended changes to the config settings
svn path=/trunk/; revision=18932
2006-08-16 22:45:51 +00:00
Gerald Combs f9661850d1 Add support for AirPcap, an upcoming wireless product from CACE. Support
is disabled by default, and can be enabled by setting AIRPCAP_CONFIG
in config.nmake.  The code is currently limited to Windows, but should
be adaptable to other platforms.

The official announcement won't come until next week, so you'll have to
read the source for details.  :)

svn path=/trunk/; revision=18928
2006-08-16 18:01:25 +00:00
Ulf Lamping f42021ee23 fix #1007: using PCAP_BREAKLOOP breaks compatibility with WinPcap 3.0, without providing any benefit on Win32, so don't use it
svn path=/trunk/; revision=18890
2006-08-13 01:07:46 +00:00
Gerald Combs 4f16b6b178 Point to the newest (1.5.0-1) GnuTLS package. Since it contains
libgcrypt, enable it in the Windows build.

In packet-ipsec.c:

  - Remove non-constants from variable declaration initializations.
  - Use ep_alloc() in a couple of places.
  - Fix an off-by-one error.
  - Reduce the number of SAs in the preferences from 4 to 2.  4 made the
    preferences window absolutely enormous.  This is probably the wrong
    way to fix this.
  - Fix up whitespace.

svn path=/trunk/; revision=18856
2006-08-09 02:00:05 +00:00
Ronnie Sahlberg 0238e4a076 enable kerberos for windows for the win32 build
svn path=/trunk/; revision=18852
2006-08-08 07:52:15 +00:00
Gerald Combs 0213f60e4b Add GNUTLS to the Windows build.
In packet-ssl.c, move ssl_set_debug() up a bit so that we can debug key
file parsing.

svn path=/trunk/; revision=18850
2006-08-07 19:52:18 +00:00
Ronnie Sahlberg db179bb768 config and makefile magic we need when we integrate kerberos for windows with the w32 build
disabled for now


svn path=/trunk/; revision=18838
2006-08-05 04:32:57 +00:00
Gerald Combs 6c787afdb4 Bump the trunk version to 0.99.3.
svn path=/trunk/; revision=18749
2006-07-17 16:05:58 +00:00
Gerald Combs 68b631ac45 Switch to Net-SNMP 5.3.1.
svn path=/trunk/; revision=18744
2006-07-17 14:11:42 +00:00
Gerald Combs f357915f4c Set the version to 0.99.2, since we're building releases from /trunk again.
svn path=/trunk/; revision=18674
2006-07-06 20:19:01 +00:00
Gerald Combs 6cda517c79 Update to Net-SNMP 5.3.0.1.
svn path=/trunk/; revision=18673
2006-07-06 19:52:48 +00:00
Gerald Combs 8d6c73e567 More ethereal -> wireshark.
svn path=/trunk/; revision=18292
2006-05-31 22:34:21 +00:00
Gerald Combs b15974d094 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.

svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Gerald Combs ee4b9b7549 ethereal.nsi -> wireshark.nsi
svn path=/trunk/; revision=18254
2006-05-30 14:28:20 +00:00
Anders Broman 7e68c9c370 Ethereal->Wireshark
svn path=/trunk/; revision=18246
2006-05-29 18:44:53 +00:00
Gerald Combs c0b00c8a2c Use GTK-Wimp 0.7.0.
svn path=/trunk/; revision=18222
2006-05-27 02:11:19 +00:00
Guy Harris aa1e053ce6 If we have pcap_breakloop(), at least on UN*X we can stop the capture
with a pcap_breakloop() call - we don't need to call select() before
calling pcap_dispatch().

Even if we do need to call select(), we don't need to supply it with a
timeout - it's OK if we block indefinitely, as the signal will interrupt
select().

That also means we can pass -1 as the count to pcap_dispatch(), as
pcap_breakloop() will terminate the loop in pcap_dispatch().

Use sigaction() to catch SIGUSR1, so we can make sure that the signal
handler doesn't get reset when the signal is delivered, and that system
calls don't restart when we return from the signal handler.

svn path=/trunk/; revision=18201
2006-05-21 21:32:04 +00:00
Gerald Combs 08dea4588e Bump the version number to 1.1. Clean up the release notes.
svn path=/trunk/; revision=18062
2006-05-01 19:21:00 +00:00
Ulf Lamping 3cd547dc0a change the HHC setting to HHC_DIR, so we can use it also to call the HtmlHelp function
svn path=/trunk/; revision=17951
2006-04-21 22:47:19 +00:00
Gerald Combs e9fb9fe971 0.10.14 -> 0.99.0.
svn path=/trunk/; revision=17849
2006-04-12 20:54:40 +00:00
Gerald Combs acebebcd61 Update Lua.
svn path=/trunk/; revision=17847
2006-04-12 20:36:31 +00:00
Luis Ontanon e21b984570 One day I'll be able to do change something in windows in a single attempt
svn path=/trunk/; revision=17641
2006-03-15 22:58:40 +00:00
Gerald Combs 050525cfb5 Add Lua support by default for Win32. Fix some compilation problems.
Add Lua information to the version paragraph.

svn path=/trunk/; revision=17440
2006-03-01 21:31:07 +00:00
Gerald Combs 0d3244a6fe Split the version under Windows into its major, minor, and micro
components.  Use them to build the VERSION, RC_VERSION, and manifest
versions (the latter two are picky about formatting).  This would
probably be useful on the autoconf side, but I didn't see an obvious
way to implement it.

svn path=/trunk/; revision=17302
2006-02-14 15:14:41 +00:00
Jörg Mayer 83068a9b9d Paolo Abeni:
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm
>fixing it and cleaning a bit the windows side configuration. I hope to
>post soon the fix.


The attached patch should fix the issue. I missed to modify the
config.win32 file and I misstyped a few macros name.


svn path=/trunk/; revision=17200
2006-02-07 10:26:20 +00:00
Lars Roland 5f1e470cc2 changes to build lua plugin with MSVC6:
- nmake makefile for lua plugin added.
- declare variables at the beginning of a function.
- proto_reg_handoff_lua was removed, remove remaining calls, too.
- missing functions to libethereal.def added.

add lua plugin to installer, if available.

svn path=/trunk/; revision=17196
2006-02-07 09:12:43 +00:00
Guy Harris ad3cb359b6 From Paolo Abeni:
Set up to build on Windows if we have GNU TLS.

	Define "ssl_data_set()" regardless of whether we have GNU TLS or
	not, as it's used in either case.

	Get rid of an extra #include of epan/gnuc_format_check.h.

svn path=/trunk/; revision=17177
2006-02-06 09:09:06 +00:00
Gerald Combs 306fbc3fdb Update to Net-SNMP 5.2.2.
svn path=/trunk/; revision=16907
2005-12-27 18:33:58 +00:00
Gerald Combs 5dd7ff581e Prep for 0.10.14.
svn path=/trunk/; revision=16872
2005-12-21 16:49:47 +00:00
Ulf Lamping f2291acd18 Declare the GTK 2.6 as the official mainline now!!!
(as per mailing list discussions and mainly as the Gimp windows port also uses this version)


fix the NSIS install settings for GTK 2.6 of GTK-Wimp

svn path=/trunk/; revision=16820
2005-12-16 08:20:22 +00:00
Gerald Combs 7463a0e9fb Fix themeing for GTK+ 2.8. This hasn't been tested under 2.6 or 2.4.
svn path=/trunk/; revision=16810
2005-12-15 19:12:51 +00:00
Gerald Combs 0616a4bedb Make sure we install the libpng and cairo DLLs if needed.
svn path=/trunk/; revision=16809
2005-12-15 03:36:17 +00:00
Gerald Combs 253b96e81f Add support for GLib/GTK+ 2.8. Point to the latest tag.
svn path=/trunk/; revision=16802
2005-12-14 21:19:39 +00:00
Ulf Lamping ede79e4d3c Win32: first steps towards using GTK2.6, add zipfile and dir name definitions
svn path=/trunk/; revision=16282
2005-10-21 18:47:04 +00:00
Gerald Combs f57b54eeb2 Updates for 0.10.13.
svn path=/trunk/; revision=16201
2005-10-12 16:17:03 +00:00
Ulf Lamping e6f26721f4 replace WinPcap devel pack 3.0 with current 3.1 version
svn path=/trunk/; revision=15972
2005-09-22 23:18:34 +00:00
Gerald Combs 33cfe1725a Sort each conversation column numerically. Fix up whitespace.
It looks like we can't put "COPYCMD=/Y" in config.nmake and expect nmake
to do the right thing.  Add a comment, and set COPYCMD explicitly in the
root Makefile.nmake.  The rest of the occurrences of xcopy will have to
be taken care of at some point.

svn path=/trunk/; revision=15840
2005-09-16 16:25:53 +00:00
Ulf Lamping 2b82bb3df7 Turn around the sequence of PATH, so the former PATH will be in front of the newly added things.
This way, the cygwin link.exe command will be behind the link.exe from MSVC.

Also added a definition of the docbook dir, floating around in my personal file for a while. This will be needed if the User's Guide is included in the NSIS installer later.

svn path=/trunk/; revision=15790
2005-09-13 19:01:08 +00:00
Anders Broman cffb22628b From Peter Johansson
PATH contents one had before starting the  build, that PATH is added to the new PATH variable 5 additional times 
instead of 1.
I have made changes (supplied) to config.nmake that takes care of this 
problem.

svn path=/trunk/; revision=15782
2005-09-13 16:48:13 +00:00
Gerald Combs adce5ed6a5 Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
to fix compilation under Windows NT.  This should fix bug 403.

The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'".  They appear to work under XP, but if anything
broke I blame Larry Wall.

svn path=/trunk/; revision=15710
2005-09-07 13:26:23 +00:00
Gerald Combs 4ba88078f9 Move to the latest ethereal-win32-libs tag.
svn path=/trunk/; revision=15706
2005-09-06 19:48:57 +00:00
Ulf Lamping 996d5b98c8 bump up the wiretap.dll version from 0.2 to 0.3 as I've recently changed the wiretap API in an incompatible way
the timestamps now contain nseconds instead of microseconds and there's a new function added.

Is there a similar place for the Unix builds where this version has to be changed too?

svn path=/trunk/; revision=15551
2005-08-27 00:37:48 +00:00
Guy Harris 4c43d63594 We've changed the Wiretap ABI (removed one routine), so bump the library
version number.

WinPcap 3.1 is no longer in alpha.  (Should we make WINPCAP_VERSION 3.1,
so we default to assuming WinPcap 3.1?)

svn path=/trunk/; revision=15438
2005-08-19 19:44:21 +00:00
Gerald Combs a64a4043c3 Revert back to GTK-Wimp 0.6.2. Move to WinPcap 3.1beta4.
svn path=/trunk/; revision=15091
2005-07-26 16:44:57 +00:00
Ulf Lamping ed92a140e4 found by Thomas Boehne: corrected GTK_WIMP_DIR, used by the NSIS installer
svn path=/trunk/; revision=15061
2005-07-25 18:44:59 +00:00
Ulf Lamping 818a760aca update to latest zlib version 123
svn path=/trunk/; revision=15060
2005-07-25 18:30:35 +00:00
Gerald Combs 7bb59ba7ed Bump the version and add a few entries to the NEWS file.
svn path=/trunk/; revision=14995
2005-07-22 16:43:05 +00:00
Gerald Combs e1c7558d93 Point to the latest Windows library tag and versions.
svn path=/trunk/; revision=14923
2005-07-15 20:50:34 +00:00
Lars Roland 7523f78185 Add a note to config.nmake that it is required to set ENABLE_LIBETHEREAL to get plugin support in Ethereal.
Change Makefile.nmake of the stats_tree plugin to the current scheme.

svn path=/trunk/; revision=14512
2005-05-31 21:34:14 +00:00
Gerald Combs f2ffbf0a46 Prep for the next release. ETA Wednesday (the 4th).
svn path=/trunk/; revision=14270
2005-05-02 16:34:24 +00:00
Guy Harris 596a4f865b It doesn't matter whether, when building with WinPcap, we have
pcap_lib_version() in the WinPcap on the system on which we're building.

svn path=/trunk/; revision=13873
2005-03-23 01:55:11 +00:00
Guy Harris 46e1907f13 If we have "pcap_freecode()", use it to free the instructions for a BPF
filter after installing the filter.

Set HAVE_PCAP_LIB_VERSION if we're building with WinPcap 3.1; it's not
present in earlier versions, but is present in current 3.1 betas.

Check HAVE_PCAP_LIB_VERSION when building capture-wpcap.c.

svn path=/trunk/; revision=13872
2005-03-23 01:25:01 +00:00
Gerald Combs f34e80a2cf Prep for 0.10.10: Update the ChangeLog and NEWS files, bump the version
number.

svn path=/trunk/; revision=13685
2005-03-09 23:49:55 +00:00
Lars Roland 138c474428 Another step towards getting the old plugin API retired:
Official plugins get linked with libethereal.dll's import library by default now. 

svn path=/trunk/; revision=13153
2005-01-21 18:50:12 +00:00
Gerald Combs 9dd5452d3e Bump the version to 0.10.9.
svn path=/trunk/; revision=13049
2005-01-15 18:18:09 +00:00
Gerald Combs 5222b52e2c Move "c:\cygwin\bin" to the end of the PATH. The latest Cygwin includes a
"link" command which collides with the MSVC linker.

svn path=/trunk/; revision=12944
2005-01-03 20:03:16 +00:00
Gerald Combs 8dddc0baa9 Updates for 0.10.8.
svn path=/trunk/; revision=12683
2004-12-07 22:26:10 +00:00
Gerald Combs 5c665d64a7 Update the Windows build to zlib 1.2.2.
Have win32-setup.sh download from "2004-11-02" tag directory.

svn path=/trunk/; revision=12474
2004-11-02 19:07:52 +00:00
Gerald Combs 6c2fcd2c92 Updates to reflect revision 4 of ethereal-win32-libs.
svn path=/trunk/; revision=12305
2004-10-15 18:30:05 +00:00
Gerald Combs fee16ab377 Add support for decoding DES3/CBC/MD5 keys. Make it disabled by default.
Whitespace cleanup.

svn path=/trunk/; revision=12304
2004-10-15 15:36:12 +00:00
Gerald Combs 5bd4eb15a8 Bump the version to 0.10.7.
svn path=/trunk/; revision=12243
2004-10-08 19:06:28 +00:00
Guy Harris 444119dbcb From Lars Roland: add an option to link plugins with libethereal rather
than using the plugin address table.

svn path=/trunk/; revision=12139
2004-09-29 19:30:10 +00:00
Guy Harris 29753bf6b2 From Gisle Vanem: add support for pcap_datalink_val_to_name() for Win32.
Also add support for pcap_datalink_name_to_val(), and arrange that we
properly define HAVE_PCAP_DATALINK_NAME_TO_VAL and
HAVE_PCAP_DATALINK_VAL_TO_NAME for MSVC++ builds.

svn path=/trunk/; revision=12073
2004-09-23 17:54:49 +00:00
Ulf Lamping 6594b60b99 I've added some more comments to the file, and changed the python default setting from native to cygwin, as all the other tools uses cygwin as the default, too.
svn path=/trunk/; revision=11885
2004-09-02 18:23:23 +00:00
Ulf Lamping dc34d74393 removed YACC_OPTS, as it seemed to be unneeded for quite a while now
svn path=/trunk/; revision=11884
2004-09-02 18:05:06 +00:00
Gerald Combs ccda3658fc Bump the version to 0.10.6. Drop in a new ChangeLog, and add the beginnings
of the release announcement to NEWS.

svn path=/trunk/; revision=11611
2004-08-06 14:08:54 +00:00
Guy Harris 1b3acfff24 Fix a comment, as per suggestions by Yaniv Kaul.
svn path=/trunk/; revision=11523
2004-07-25 18:49:24 +00:00
Guy Harris f28323ba39 From Graham Bloice: add resources to wiretap.dll.
svn path=/trunk/; revision=11476
2004-07-23 06:11:50 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Gerald Combs df8f6cdb5e Use libethereal.dll by default.
svn path=/trunk/; revision=11374
2004-07-13 18:19:59 +00:00
Gerald Combs a3545d4b9f Enable GTK_WIMP and GTK2 by default. Make GTK2 2.4 and Pango 1.4 the default
versions.

svn path=/trunk/; revision=11335
2004-07-07 19:15:46 +00:00
Gerald Combs 44f812de8e Prep for the 0.10.5 release.
svn path=/trunk/; revision=11319
2004-07-06 16:29:18 +00:00
Ulf Lamping 4ee816d884 add GTK2.4 and alike libs to the setup target,
depending on settings in config.nmake

svn path=/trunk/; revision=11201
2004-06-20 20:28:23 +00:00
Ulf Lamping 17a6cec78f update DOXYGEN setting and add new HHC (MS html help compiler) setting
svn path=/trunk/; revision=11108
2004-06-04 17:31:11 +00:00
Anders Broman ea7b5edf35 Revert previous checkin made by mistake *sigh
svn path=/trunk/; revision=11061
2004-06-01 21:45:40 +00:00
Anders Broman cf28fb1538 From Thomas Anders dissects the RTP Payload Type (if media protocol is RTP/AVP)
with its descriptive name rather than the raw value string,
much like packet-rtp.c does already.
To avoid duplicate definitions,  the existing rtp_payload_type_vals[] definition is  moved
from packet-rtp.c and gtk/rtp_stream_dlg.c to rtp_pt.h.

svn path=/trunk/; revision=11060
2004-06-01 21:40:41 +00:00
Guy Harris 01c249fd4f From Lars Roland: define an "installation" version of GTK+ 2.x and Pango
in "config.nmake", and use that in the NSIS script when generating the
NSIS installer, so it puts GTK+ and Pango in the appropriate
subdirectories.  Also, when uninstalling, remove both of the sets of
subdirectories.

As per his suggestion, get rid of the "GTK1_VERSION" and "GTK2_VERSION"
macros, and just directly insert the values where those macros were used
- "GTK1_VERSION" wasn't used at all, and "GTK2_VERSION" was only used
immediately below where it was defined, and stuff elsewhere, such as in
the NSIS script, didn't use them and would break if you changed them
anyway.

svn path=/trunk/; revision=10976
2004-05-23 22:21:30 +00:00
Gerald Combs fa3bc245fd Bump the version up to 0.10.4. Preliminary updates to the NEWS file. Updates
welcome.

svn path=/trunk/; revision=10863
2004-05-13 03:34:14 +00:00
Ulf Lamping 904982df8e add "configurable" path to doxygen.exe
svn path=/trunk/; revision=10845
2004-05-11 01:05:13 +00:00
Guy Harris 15af0f656f From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
	libethereal.dll or not;

	remove "./wiretap" from PATH to prevent problems due to
	wrongly-loaded files;

	build dissector.lib with MSVC;

	move "print.c" and "ps.c" to the dissector helpers, as "print.c"
	imports variables from packet-frame.c and packet-data.c, which
	are in libethereal;

	move "g711.c" out of the dissector helpers, as they're used only
	by Ethereal in a tap, not in Tethereal or in any dissector;

	add a .def file for libethereal;

	arrange to declare global variables exported from libethereal
	with "__declspec(dllimport)" when building programs that import
	those variables;

	update the NSIS installer.

Make the "configure" script define ETH_VAR_IMPORT as "extern".

svn path=/trunk/; revision=10834
2004-05-09 10:03:41 +00:00
Gerald Combs a011fb14e2 Add a Makefile.nmake target called "setup" that uses the script
tools\win32-setup.sh to

  - Check for applications required to build Ethereal
  - Download and unpack required packages into $ETHEREAL_LIBS

Update ADNS to the latest version.

Make Python 2.3 the default.

svn path=/trunk/; revision=10567
2004-04-08 20:36:09 +00:00
Gerald Combs 4c0ecdcd9b Bump the version up to 0.10.3.
svn path=/trunk/; revision=10436
2004-03-22 17:03:30 +00:00
Ulf Lamping 301b5ddbcc added gtk-wimp to the nsis installer build
svn path=/trunk/; revision=10227
2004-02-24 18:51:40 +00:00
Gerald Combs d389b5207e Bump the version to 0.10.2
svn path=/trunk/; revision=10205
2004-02-23 21:53:05 +00:00
Gerald Combs 0fca486734 Bump the version to 0.10.1.
svn path=/trunk/; revision=10100
2004-02-19 00:28:15 +00:00
Ulf Lamping 132c807e39 making the Modern UI the default
svn path=/trunk/; revision=10022
2004-02-10 18:12:40 +00:00
Guy Harris a4464a6788 Raise the Wiretap version number to 0.1, as the current version isn't
binary-compatible with earlier versions.  (That should have been done
for all binary-incompatible changes, and should be done for
binary-incompatible changes in the future.)

svn path=/trunk/; revision=9916
2004-01-31 03:35:25 +00:00
Ulf Lamping 064d5e5e07 Added the ability to compile both GTK versions 1 and 2 at the same time.
svn path=/trunk/; revision=9827
2004-01-24 20:01:36 +00:00
Gerald Combs e98fb47e76 Update to GLib 2.2.3-20040116 and gettext 0.13.1.
svn path=/trunk/; revision=9799
2004-01-23 02:38:03 +00:00
Ulf Lamping 87fc510cb5 switched to MSVC warning level 3 and
default is winpcap version 3 now

svn path=/trunk/; revision=9562
2004-01-05 21:04:42 +00:00
Ulf Lamping 391cfa861d From Lars Roland: corrected PATH settings
svn path=/trunk/; revision=9554
2004-01-05 15:05:00 +00:00
Ulf Lamping 35e5ba4edd all libs now relative to a base dir, use compiler warning level 2
svn path=/trunk/; revision=9461
2003-12-28 18:31:14 +00:00
Ulf Lamping cce063356e added/changed some comments
svn path=/trunk/; revision=9456
2003-12-27 13:19:06 +00:00
Ulf Lamping b6092e26fd conditionally use modern UI for NSIS installer
svn path=/trunk/; revision=9447
2003-12-26 11:37:58 +00:00
Ulf Lamping 16cb58be9a removed COMMON_FILES_GNU from path,
use the directories xy_DIR from the settings above

svn path=/trunk/; revision=9430
2003-12-23 11:57:26 +00:00
Ulf Lamping f86e376f5b get rid of the COMMON_FILES_GNU setting,
by getting the DLL's from the "source tree"

svn path=/trunk/; revision=9415
2003-12-22 21:41:40 +00:00
Ulf Lamping 9499f200a6 calling pod2man and pod2html indirectly through the bash
svn path=/trunk/; revision=9414
2003-12-22 21:34:13 +00:00
Gerald Combs 9fd657a0e1 Bump the version to 0.10.0. It could be (and has been) argued that the
last release should have been 0.10.0.

svn path=/trunk/; revision=9235
2003-12-10 21:50:04 +00:00
Gerald Combs 409948eced Add PCRE support to the Windows build.
svn path=/trunk/; revision=9185
2003-12-07 00:04:32 +00:00
Gerald Combs c219943fc1 Switch over to Net-SNMP 5.1. A ZIP file of the Net-SNMP 5.1 sources plus
a static Windows library (netsnmp.lib) has been placed at

    http://www.ethereal.com/distribution/win32/development/

The Net-SNMP documentation recommends against using a DLL at the
present time.

svn path=/trunk/; revision=9177
2003-12-05 16:00:34 +00:00
Gerald Combs 7569aef3df Switch to the new (and official) zlib DLL from www.gzip.org.
svn path=/trunk/; revision=9127
2003-12-01 17:17:51 +00:00
Ulf Lamping c4df7b705a added gdk_pixbuf to GTK2 specific libs to link (needed in toolbar.c)
svn path=/trunk/; revision=8972
2003-11-15 11:39:57 +00:00
Guy Harris 73fdd454b6 Get rid of GLib 1.3 support - current versions of GTK+ 1.3 require GLib
2.0, and earlier versions are sufficiently buggy that we don't want to
support them.

svn path=/trunk/; revision=8939
2003-11-11 18:25:04 +00:00
Guy Harris 4192ad9770 Let people configure whether to build with Zlib or not solely by
controlling whether ZLIB_DIR is defined or not in config.nmake.

svn path=/trunk/; revision=8911
2003-11-07 23:27:13 +00:00
Gerald Combs cb452773c2 Bump the version number to 0.9.16.
svn path=/trunk/; revision=8861
2003-11-02 23:36:01 +00:00
Guy Harris bd2ea47524 Configure whether we have WinPcap based on whether WINPCAP_VERSION is
set in the config.nmake file.

Configure whether we have pcap_findalldevs() based on whether
WINPCAP_VERSION is 2.3 (if so, we don't) or 3.0 or 3.1 (if so, we do).

WinPcap 3.0 has the new libpcap declarations of "pcap_lookupnet()" and
"pcap_open_live()" in which the first argument is a "const char *"
rather than a "char *"; declare the functions and pointers to them
appropriately based on the version of WinPcap.

If we don't have pcap_findalldevs(), don't declare a pointer to it, as
we don't have a declaration of pcap_if_t.

We also need to refer to "pcap_freealldevs()", so make a pointer for it.

"symbols[]" is a const array; make the pointer to elements in it a const
pointer.

Fix some typoes.

svn path=/trunk/; revision=8660
2003-10-10 09:48:54 +00:00
Gerald Combs f87f524260 Bump the version to 0.9.15. Update the NEWS and ChangeLog to August 27. More
updates to come.

svn path=/trunk/; revision=8410
2003-09-08 03:13:15 +00:00