Commit Graph

275 Commits

Author SHA1 Message Date
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
Gerald Combs 3303295c84 Add default development package locations to README.win32. Use zlib 1.1.4
by default in config.nmake.

svn path=/trunk/; revision=8246
2003-08-24 23:25:40 +00:00
Guy Harris 6f4508de8c Define GCC_GLIB_CFLAGS as a GCC equivalent of GLIB_CFLAGS, and use it
instead of -I$(GLIB_DIR) when running GCC to generate the xyzzy file, so
that the right -I flags are used.

svn path=/trunk/; revision=8190
2003-08-19 02:16:26 +00:00
Gerald Combs ddd408ad2f Build with Glib 2.0 and GTK+ 1.3 by default. Don't build with zlib 1.13.
Add minor updates to README.win32.

svn path=/trunk/; revision=8126
2003-08-04 14:34:17 +00:00
Guy Harris 0f9b1a0458 From Lars Roland: add support for GTK+ 1.3 with GLib 2.0 (the latest
GTK+ 1.3[.x]-for-Win32, which fixes several GTK+ problems, requires GLib
2.0, not GLib 1.3).

svn path=/trunk/; revision=8125
2003-08-04 08:10:33 +00:00
Gerald Combs c6e91e0aa6 Prep for the 0.9.14 release
svn path=/trunk/; revision=8068
2003-07-23 02:06:25 +00:00
Guy Harris a9af7329b8 Well, you need more than just an escaped # to handle the undef, so go
back to defining it as nothing.

svn path=/trunk/; revision=7939
2003-06-26 08:41:33 +00:00
Guy Harris f808651b9e OK, try bringing back the #undef, now that we know how to escape the #.
svn path=/trunk/; revision=7927
2003-06-25 06:49:59 +00:00
Gerald Combs ad59ab2353 Properly escape the '#' character in the HAVE_GNU_ADNS definition.
svn path=/trunk/; revision=7924
2003-06-24 18:51:21 +00:00
Guy Harris 2e0b314579 Handle the 1.3 vs. 2.x issue similarly to the way Lars Roland's patches
did, basing the path name structure on the version number, but handle
GLib and GTK+ orthogonally.

svn path=/trunk/; revision=7896
2003-06-17 05:38:24 +00:00
Guy Harris b65f1a77c1 From Lars Roland:
fix typo in my earlier checkin - GTK_GLIB_DIR should be
	GLIB_GTK_DIR;

	look for headers in "lib\glib-$(GLIB_VERSION)\include and
	"lib\gtk-$(GTK_VERSION)\include, as that's where the 2.x
	packages hide "glibconfig.h" and "gdkconfig.h".

svn path=/trunk/; revision=7894
2003-06-17 04:21:59 +00:00
Guy Harris c70953341c "!IFDEF" just takes the name of the variable as an argument.
We do have to look for headers in $(GTK_DIR)\gdk when using the
development packages from the Ethereal Web site, as "gdkconfig.h" is in
that directory but it's included as <gdkconfig.h>.

The commented string for ADNS_CONFIG doesn't appear to get substituted
as we want it to be; just use an empty string for now.

svn path=/trunk/; revision=7892
2003-06-16 07:58:26 +00:00
Guy Harris 0bdb498bdb Do all the tests for whether ADNS_DIR is defined or not in
"config.nmake", and just use the variables set based on the results of
those tests in various "Makefile.nmake" files.

svn path=/trunk/; revision=7891
2003-06-15 23:04:47 +00:00
Guy Harris c88189af06 Based on a change from Lars Roland, set the GLIB_CFLAGS, GTK_CFLAGS,
GLIB_LIBS, and GTK_LIBS variables based on whether the GLib and GTK+
header files and libraries are in separate "glib" and "gtk+" directories
(as is the case for the developer's packages from the Ethereal Web site)
or in the same directory (as is the case for the developer's packages
from the GTK+-for-Win32 site).

svn path=/trunk/; revision=7890
2003-06-15 22:58:19 +00:00
Guy Harris 8178db4980 Define GLIB_LIBS and GTK_LIBS variables in config.nmake (based on
variables the user configures - the user isn't expected to change
GLIB_LIBS or GTK_LIBS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate libraries for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.

svn path=/trunk/; revision=7885
2003-06-14 20:45:29 +00:00
Guy Harris 71424053cd Define GLIB_CFLAGS and GTK_CFLAGS variables in config.nmake (based on
variables the user configures - the user isn't expected to change
GLIB_CFLAGS or GTK_CFLAGS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate "/I" flags for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.

svn path=/trunk/; revision=7884
2003-06-14 20:36:04 +00:00
Guy Harris 25bd670668 From Lars Roland: use $(COMMON_FILES_GNU) in the PATH setting, don't
duplicate the setting of $(COMMON_FILES_GNU).

svn path=/trunk/; revision=7883
2003-06-14 03:23:21 +00:00
Guy Harris a4e02bed1e As per a patch from Lars Roland, make RC_VERSION comma-separated.
Also put in a comment noting that it should be comma-separated, and
noting why it should be comma-separated.

svn path=/trunk/; revision=7880
2003-06-13 22:43:37 +00:00
Guy Harris ec5499613d Don't wire into "config.h.win32" files an indication of whether we have
GNU ADNS or not - set it based on whether ADNS_DIR is defined by
"config.nmake", and make "config.h.win32" files that specify whether we
have GNU ADNS dependent on "config.nmake".

Note in "config.nmake" that:

	if you have GNU ADNS, ADNS_DIR should be defined as the
	directory in which the ADNS .lib file resides;

	if you don't have GNU ADNS, ADNS_DIR shouldn't be defined.

svn path=/trunk/; revision=7860
2003-06-12 09:45:42 +00:00
Gerald Combs bc8ef81903 Bump the version to 0.9.13 and otherwise prep for the next release. ETA is
Wednesday.

svn path=/trunk/; revision=7820
2003-06-10 01:47:34 +00:00
Gerald Combs f755cf5034 Add GNU ADNS to the Windows build environment. A precompiled DLL can be
found at

	http://adns.jgaa.com/

and

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

The modifications to the root-level config.h.win32 and Makefile.nmake
may not be neccessary.

svn path=/trunk/; revision=7769
2003-06-02 18:40:02 +00:00
Gerald Combs c5f6451d30 Bump the version number to 0.9.12. Make NEWS and ChangeLog current.
The next release will likely be tomorrow (May 1).

svn path=/trunk/; revision=7622
2003-05-01 03:09:54 +00:00
Guy Harris 458e915b90 From Graham Bloice: make the RC_VERSION variable in config.nmake
comma-separated, so that the resources will be built correctly and the
version number correctly displayed in the GUI, and make the resources
dependent on "config.nmake" so that they're rebuilt if it's changed.

svn path=/trunk/; revision=7373
2003-03-26 20:17:42 +00:00
Gerald Combs 656eb2b35c Bump the version to 0.9.11. Let's hope the goat's blood and hastily carved
idol is enough for the CVS gods.

svn path=/trunk/; revision=7337
2003-03-11 00:12:39 +00:00
Gerald Combs fbd2efeccc Bump the version to 0.9.10.
svn path=/trunk/; revision=7271
2003-03-04 03:56:33 +00:00
Gerald Combs fe60d5b02e Bump the version to 0.9.9. Update the NEWS and ChangeLog files.
I'm shooting for a release on Wednesday evening.

svn path=/trunk/; revision=6952
2003-01-21 02:12:37 +00:00
Gerald Combs 3835ed4585 Bump the version to 0.9.8. Update NEWS and ChangeLog to October 24.
svn path=/trunk/; revision=6741
2002-12-04 04:26:14 +00:00
Guy Harris ad9ec1af37 Cygwin doesn't necessarily come with an "sh.exe", so use "$(SH)" rather
than "sh" to run a Bourne-compatible shell in "Makefile.nmake", and
define "SH" to be "bash" in "config.nmake".

svn path=/trunk/; revision=6540
2002-11-01 10:01:21 +00:00
Gerald Combs ec8fd2703a Link to libsnmp under Win32.
In gtk/main.c and tethereal.c set MIBDIRS to <get_program_path()>\snmp\mibs
so that we can drop the MIB files there, instead of the default c:\usr\...
path.

Add NET_SNMP_DIR to config.nmake and modify Makefile.nmake to adjust
CFLAGs, ethereal_LIBS and tethereal_LIBS accordingly.

Define HAVE_UCD_SNMP in config.h.win32.

I tested this by creating c:\program files\ethereal\snmp\mibs and
dropping in the MIB files that come with Net-SNMP.  Ethereal resolved
system.sysDescr.0 to "iso.3.6.1.2.1.1.1.0" under Windows.  Under Linux
it resolved to "SNMPv2-MIB::sysDescr.0".

Ethereal.nsi still needs to be updated.

A compiled version of the Net-SNMP library can be found at

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

svn path=/trunk/; revision=6385
2002-10-09 03:07:34 +00:00
Gerald Combs e23851ca23 Bump the version up to 0.9.7. The countdown begins. Too bad our
releases don't involve explosive bolts like NASA launches do.

Bring the ChangeLog and NEWS files up to date to the end of August.

svn path=/trunk/; revision=6341
2002-09-26 19:06:43 +00:00
Gerald Combs 42427f21a7 Add COMMON_FILES_GNU definition.
svn path=/trunk/; revision=6021
2002-08-19 15:55:43 +00:00
Gerald Combs 5a579fc0b5 Bump the version number to 0.9.6. Update the ChangeLog. Add rough
release notes to NEWS.

svn path=/trunk/; revision=6006
2002-08-17 17:53:33 +00:00
Gerald Combs 1d91164b2a Bump the version up to 0.9.5.
svn path=/trunk/; revision=5779
2002-06-28 20:15:31 +00:00
Gerald Combs 024306cdcf Increment versions to 0.9.4, get NEWS current to April 25 (more NEWS to
come).

svn path=/trunk/; revision=5500
2002-05-18 04:00:35 +00:00
Gerald Combs dade8cbf56 Bump the version to 0.9.3. Update NEWS to be current to
http://www.ethereal.com/lists/ethereal-cvs/200203/msg00175.html (the
rest will be added later).

svn path=/trunk/; revision=5042
2002-03-29 03:33:59 +00:00
Gerald Combs 7fef8be5ec Bump the version to 0.9.2. Update NEWS to include everything from February.
svn path=/trunk/; revision=4856
2002-03-03 23:59:29 +00:00
Gerald Combs fcb82bfed0 Update version to 0.9.1. Add NEWS entries for 0.9.1 changes.
svn path=/trunk/; revision=4684
2002-02-02 22:27:44 +00:00
Guy Harris cb489a92bb From Hamish Moffatt:
Additional Windows Makefile dependencies, so more stuff gets
	built as needed.

	Additional stuff cleaned up by "make clean" (well, "nmake -f
	makefile.nmake clean", anyway)

	Make PDB_FILE be "vc*.pdb", so it referes to the PDB files
	either for VC++ 5.0 or VC++ 6.0.

svn path=/trunk/; revision=4481
2002-01-04 21:20:20 +00:00
Guy Harris 5027073407 From Hamish Moffatt:
Add some missing files in the "clean" targets.

	Use pod2html rather than man2html to build HTML man pages.

	Fix ethereal.nsi.in for recent versions of NSIS, and fix a typo.

svn path=/trunk/; revision=4475
2002-01-04 06:57:10 +00:00
Gerald Combs 2701bbc077 Bump the version up to 0.9.0. Update the NEWS file.
svn path=/trunk/; revision=4440
2001-12-23 21:11:24 +00:00
Guy Harris 1e8ca8af4d From Motonori Shindo: don't put the PDB files into the release, as
they're not built and the executables already contain debugging
information, and update the README.win32 file appropriately and add
Text2Pcap and Mergecap to it.

svn path=/trunk/; revision=4425
2001-12-19 19:16:12 +00:00
Guy Harris 39362af814 From Motonori Shindo:
fix a bogus batch mode inference rule of make, so that
	"vc60.pdb" files are created in the proper directory;

	delete ".pdb" files in a "nmake -f Makefile.nmake clean";

	include the text2pcap and mergecap ".pdb" files in the Windows
	binary distribution.

svn path=/trunk/; revision=4385
2001-12-12 01:29:13 +00:00
Gerald Combs 3ccc10f622 Get NEWS current up to July 31, update version to 0.8.20.
svn path=/trunk/; revision=4021
2001-10-12 17:17:05 +00:00
Jeff Foster e49b8d5da7 Updated for release 0.8.19
svn path=/trunk/; revision=3716
2001-07-13 13:54:56 +00:00
Gilbert Ramirez 34e8119c32 Package mergecap.exe and its HTML documentation.
Update NSIS syntax for newest NSIS. That fix from David O'Shea.
Set config.nmake to get non-cygwin version of Python.exe; cygwin version
is fouling up on me and I'm not sure why.

svn path=/trunk/; revision=3705
2001-07-12 22:45:23 +00:00
Jeff Foster 4004d96518 Update files for release 8.18
svn path=/trunk/; revision=3415
2001-05-16 16:17:52 +00:00
Jeff Foster 4004075d48 Updated for release 0.8.17
svn path=/trunk/; revision=3289
2001-04-11 16:35:02 +00:00
Gilbert Ramirez b71792efa4 Build with zlib.
Pre-compiled zlib provided at
	http://www.ethereal.com/distribution/win32/zlib-1.1.3-fixed.zip
"fixed" because the pre-compiled version in the "extralibs" package
from the Gimp/Win32 page has a fault zlib.lib in it.

Add note about zlib in README.win32; more work needs to be done to
this file to mention new packaging method.

svn path=/trunk/; revision=3263
2001-04-06 03:52:45 +00:00
Gilbert Ramirez a8d864bca7 Use sed in the Win32 build to place the version in various files.
We us $(VERSION), defined in the top-level config.nmake, to replace
@VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are
similarly used.

svn path=/trunk/; revision=3258
2001-04-05 04:39:29 +00:00
Gilbert Ramirez e03cc2278c Packaging files for Win32, using NSIS, the NullSoft Installer, that
was originally written for WinAmp. See http://www.nullsoft.com/free/nsis/

svn path=/trunk/; revision=3255
2001-04-04 04:50:05 +00:00
Gilbert Ramirez e108afe2bb The Win32 build builds wiretap as a DLL and requires WinPcap 2.1.
svn path=/trunk/; revision=3163
2001-03-23 02:05:29 +00:00
Gilbert Ramirez 682dc85b3a Add ability to create HTML documentation on Windows, if you have
perl and man2html. Don't call this makefile from the parent makefile
as not everyone will want to create documentation.
Add a couple variables to config.nmake to support this.

svn path=/trunk/; revision=3119
2001-03-09 03:43:58 +00:00
Gilbert Ramirez 4b6b3da4e7 Add some win32-specific targets in .cvsignore's.
Replace 'nmake' with $(MAKE) /$(MAKEFLAGS), from Mike Frisch.

svn path=/trunk/; revision=3108
2001-03-06 13:08:13 +00:00
Gilbert Ramirez 26bda31ed9 Move inet_*.[ch] files to epan.
svn path=/trunk/; revision=2494
2000-10-14 04:31:26 +00:00
Gilbert Ramirez 8ceb7d40f9 Add the re-write of the NetWare Core Protocol dissector. It's mostly
a framework for the dissector; of the more than 400 NCP packet types, only
a handful are defined. But this dissector framework is much better than
the previous one.

svn path=/trunk/; revision=2173
2000-07-28 20:03:59 +00:00
Guy Harris 3c9a310b6d Graham Bloice's changes to, on Win32 using Microsoft's "nmake":
build "register.c" in the top-level Makefile;

	set path in "config.nmake" to include the Cygwin directory for
	tools - those tools are needed to build "register.c";

	remove constructed source files, and some additional object
	files, when doing "nmake clean".

svn path=/trunk/; revision=1896
2000-04-29 07:35:07 +00:00
Gilbert Ramirez ed237c129d Build tethereal and editcap on Win32.
Add RCS ID tags to Makefile.nmake's.

svn path=/trunk/; revision=1836
2000-04-12 21:52:11 +00:00
Gilbert Ramirez f9a8a11ef5 Integrate Ed Meaney's <emeaney@altiga.com> changes for using libpcap
from WinDump with Ethereal. We now have packet capturing on Win32. :)

svn path=/trunk/; revision=1612
2000-02-09 19:18:42 +00:00
Gilbert Ramirez 41f0a2c5e6 Update Makefiles for win32. Move local configuration to config.nmake,
have top-level Makefile.nmake call Makefile.nmake's in subdirectories.
Build plugins, and build generated source (lex, yacc). The only thing we
can't build is register.c; I need to re-work the top-level Makefile.nmake
because it lists object files, not C files, which make-reg-dotc needs.

svn path=/trunk/; revision=1608
2000-02-09 00:41:57 +00:00