Commit graph

815 commits

Author SHA1 Message Date
Stephen Fisher
587bd2724f Move native Win32 code to its own directory and out of gtk directory (hopefully without breaking any builds)
svn path=/trunk/; revision=35032
2010-11-26 19:16:06 +00:00
Bill Meier
cf794aea59 Prevent "MS-DOS style path detected" messages for several commands (when "nodosfilewarning" not set).
svn path=/trunk/; revision=35006
2010-11-22 17:17:46 +00:00
Gerald Combs
b2a92a4c35 Use the latest User's Guide.
svn path=/trunk/; revision=34470
2010-10-11 16:01:48 +00:00
Jeff Morriss
81b5ece966 It seems it's quite hard to set and retrieve environment variables in nmake (at least I can't figure it out). So, just cd back to MAKEDIR after cleaning up. This should get the buildbots going again and fix bug 5275.
svn path=/trunk/; revision=34381
2010-10-05 15:33:07 +00:00
Stephen Fisher
afebfa60ca Try to make r34375 work every time
svn path=/trunk/; revision=34378
2010-10-04 22:53:18 +00:00
Stephen Fisher
5abf2b2c9f Use spaces instead of tabs on two lines added in r34375
svn path=/trunk/; revision=34377
2010-10-04 22:04:49 +00:00
Stephen Fisher
7b35e1195c Stop the MS-DOS style path name warnings when compiling on Windows.
svn path=/trunk/; revision=34375
2010-10-04 22:00:50 +00:00
Gerald Combs
0721b1ff79 Don't remove the services file. It isn't built in the same way that
sminmpec.c is.

svn path=/trunk/; revision=34373
2010-10-04 20:47:50 +00:00
Gerald Combs
3e84ad5147 Copy make-sminmpec.pl to make-services.pl and modify it to fetch the
IANA port-numbers file and save it to "services". Use it to update
"services".

svn path=/trunk/; revision=34371
2010-10-04 18:53:39 +00:00
Sake Blok
6c97a708c9 Make "bpf_image" available on Windows. This enables the "Compile BPF" button and "dumpcap -d" on Windows.
svn path=/trunk/; revision=34357
2010-10-03 22:42:27 +00:00
Sake Blok
f3e94f6753 Retry of SVN 34338, now tested on my WinXP dev VM:
Use pcap_open_dead instead of pcap_create for the compile BPF button. 



svn path=/trunk/; revision=34340
2010-10-03 12:04:18 +00:00
Jeff Morriss
d8310ff499 Assume we HAVE_GZCLEARERR on Windows and when using cmake
svn path=/trunk/; revision=34192
2010-09-23 05:50:10 +00:00
Jeff Morriss
4584a81149 Revert 34081 and 34093 in preparation for a cleaner fix.
svn path=/trunk/; revision=34121
2010-09-15 15:13:17 +00:00
Jeff Morriss
a81a10a63a From BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :
Followup to 34081: move libwsutil _all_ the way forward so that our inet_pton
is always linked in before wsock32's.  This means that our Windows-7 Win64
builds (on which there is a native inet_pton in wsock32) will still work on
pre-Vista Win64's.

svn path=/trunk/; revision=34093
2010-09-10 13:52:42 +00:00
Jeff Morriss
875c97aedf Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :
Move libwsutil forward in the list of Wireshark libraries so that our inet_pton
is always used.

svn path=/trunk/; revision=34081
2010-09-08 16:51:12 +00:00
Guy Harris
a6bd4f554a capinfos.c includes gcrypt.h, so it needs the GNU TLS flags.
svn path=/trunk/; revision=33536
2010-07-15 09:41:34 +00:00
Guy Harris
4b6f53894a There shouldn't be any need to build stuff in the top-level directory
with the Lua or libgnutls flags, as nothing in the top-level directory
should use them directly.

However, libwireshark *does* require the Lua flags, so use them.

svn path=/trunk/; revision=33534
2010-07-15 03:31:51 +00:00
Guy Harris
2326b33f0a No need to link dumpcap with libgnutls.
svn path=/trunk/; revision=33533
2010-07-15 03:28:42 +00:00
Gerald Combs
f4bb9209ae Add a target which creates a zip file containing our .pdb files.
svn path=/trunk/; revision=33460
2010-07-06 22:35:33 +00:00
Gerald Combs
fe79af8f42 From Kovarththanan Rajaratnam via bug 3500:
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
2010-06-01 22:20:15 +00:00
Jeff Morriss
47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +00:00
Bill Meier
0303dfbf9f Manifests are not needed when building with VC10.
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

svn path=/trunk/; revision=32540
2010-04-22 19:35:47 +00:00
Bill Meier
201c878a4e (Trivial) Escape a '?' in an error message.
svn path=/trunk/; revision=32504
2010-04-18 14:08:12 +00:00
Gerald Combs
6cd62e9e65 Rename README.win32 to README.windows and add a 64-bit download link.
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440
2010-04-09 21:42:51 +00:00
Gerald Combs
12e2df52e1 Update c-ares to 1.7.1.
svn path=/trunk/; revision=32293
2010-03-26 18:36:27 +00:00
Guy Harris
42a9ea8eaa Use the right #define value to check whether WinPcap has
pcap_free_datalinks().

*Set* that #define, while we're at it.

svn path=/trunk/; revision=32220
2010-03-17 18:04:21 +00:00
Guy Harris
7923c40e07 Include inet_pton.obj when building TShark, as we now need it.
(But it built on the Win64 buildbot; did Microsoft add it in later
releases?  If so, should we include it only if it's needed?)

svn path=/trunk/; revision=32107
2010-03-04 02:42:07 +00:00
Bill Meier
b96c45d391 Enable command-line wildcard expansion when invoking mergecap and capinfos
by linking those executables with setargv.obj.
See http://www.wireshark.org/lists/wireshark-users/201002/msg00194.html
  (and preceeding messages in the thread).


svn path=/trunk/; revision=31943
2010-02-21 22:06:50 +00:00
Anders Broman
72cfbf1e01 Use the latest GTK bundle (2.18.7)
svn path=/trunk/; revision=31882
2010-02-15 20:57:50 +00:00
Gerald Combs
f1958a48f9 Drop our requirement for MSVCR71.DLL.
svn path=/trunk/; revision=31578
2010-01-19 22:58:12 +00:00
Stig Bjørlykke
229d8368bc Set correct locale in make-version.pl instead of in Makefiles.
Added back add_custom_command for svnversion.h.
Removed unnecessary text2pcap_CLEAN_FILES.
Fix indent for ps.c command.

svn path=/trunk/; revision=31525
2010-01-14 15:43:33 +00:00
Bill Meier
a36e595c8d Don't try to build NSIS installer if MAKENSIS not defined in config.nmake.
Fixes Bug #3362.
Also: Use _FORCE_ instead of FORCE as dummy target.

svn path=/trunk/; revision=31510
2010-01-12 22:27:41 +00:00
Bill Meier
b77ad63939 From Jim Young: patch to trigger recompilation on svnversion.h change.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4361

svn path=/trunk/; revision=31411
2010-01-02 17:34:45 +00:00
Bill Meier
fce59a00bb From Jim Young: Fix for "nmake call to cygwin 1.7.1 bash fails if win32 style backslash path delimiters".
Note the change seems to also work AOK for cygwin1.5.?.

See Bug #4359. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4359

svn path=/trunk/; revision=31370
2009-12-28 01:47:10 +00:00
Gerald Combs
7b42cf5135 Use the official kfw packages.
svn path=/trunk/; revision=31355
2009-12-23 00:22:12 +00:00
Gerald Combs
8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
2009-12-21 21:06:01 +00:00
Gerald Combs
7046509b99 Use the WinPcap version of pcap_datalink_val_to_description if it's
present.  Add an entry for DLT_PPI in case it's not.

svn path=/trunk/; revision=31316
2009-12-18 20:36:36 +00:00
Gerald Combs
7524c0b963 Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installer
build.

svn path=/trunk/; revision=31301
2009-12-17 22:01:13 +00:00
Jaap Keuter
ba0c85ba08 From Pascal Quantin:
The attached patch force 'svn info' command output as english to enable
detection of svn revision, whatever language is configured in Windows.

svn path=/trunk/; revision=31245
2009-12-11 17:24:57 +00:00
Gerald Combs
e5be652056 Fix compilation under Windows. Allocate our hash buffer dynamically so
that _chkstk doesn't throw a hissy fit. When hashing, open the file in
binary mode.

svn path=/trunk/; revision=31192
2009-12-08 00:13:57 +00:00
Gerald Combs
907bf4e36b Switch from individual GLib, GTK+, and related packages to the all-in-one
versions.

svn path=/trunk/; revision=31023
2009-11-19 20:27:08 +00:00
Gerald Combs
23df4e7f01 Update the AirPcap code for Win64 and enable AirPcap for the 64-bit build.
svn path=/trunk/; revision=30945
2009-11-12 23:48:11 +00:00
Tomas Kukosa
7f38b7b889 Update to the GnuTLS 2.8.5
svn path=/trunk/; revision=30930
2009-11-11 09:58:29 +00:00
Anders Broman
c5ce562d60 Use pango 1.26
svn path=/trunk/; revision=30687
2009-10-25 09:59:40 +00:00
Stig Bjørlykke
98024a007f Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_H
Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision.

svn path=/trunk/; revision=30370
2009-10-06 16:01:18 +00:00
Kovarththanan Rajaratnam
1b2498d074 Move make-tapreg-dotc to tools/make-tapreg-dotc
svn path=/trunk/; revision=30284
2009-10-04 08:10:54 +00:00
Kovarththanan Rajaratnam
ac8f637590 Move rdps.py to tools/rdps.py
svn path=/trunk/; revision=30281
2009-10-04 07:50:36 +00:00
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
Bill Meier
ba2e9c002f (Trivial) Update a comment and an error message.
svn path=/trunk/; revision=29946
2009-09-16 16:27:37 +00:00
Anders Broman
ef2d9da167 Use the latest GTK packages.
svn path=/trunk/; revision=29943
2009-09-16 13:34:37 +00:00