Commit Graph

796 Commits

Author SHA1 Message Date
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
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 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
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 91caa01090 Add /MP flag to make use of multi cores.
svn path=/trunk/; revision=29104
2009-07-15 20:55:31 +00:00
Gerald Combs 72a20c1695 Pull mkstemp() into tempfile.c. That's the only place we use it now, and
it's arguably the only place we _should_ use it. Add create_tempdir() to
tempfile.c and use it to create a temp directory for IP maps. This
should fix bug 3530.

(This still doesn't work on IE 8 / Vista here. IE gives an access denied
error in OpenLayers.js, but this is a separate issue).

svn path=/trunk/; revision=28920
2009-07-02 17:20:27 +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
Jeff Morriss c47eeae22b Move the generated documentation (man pages, AUTHORS-SHORT-FORMAT, and
AUTHORS-SHORT) into doc/.  This cleans up the top-level Makefile.am (no more
need to have rules for each man page in both files) and solves the
parallel-build problem described in:

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3494

svn path=/trunk/; revision=28784
2009-06-21 12:47:48 +00:00
Bill Meier c4e626904c clean: remove directory of previous upx301.
svn path=/trunk/; revision=28735
2009-06-15 12:40:53 +00:00
Bill Meier 26b029de66 Fix a typo.
svn path=/trunk/; revision=28723
2009-06-14 12:50:52 +00:00
Bill Meier ae434fdbe3 If Makefile.nmake/config.nmake updated: Check versions of individual library packages.
This is in addition to the "tag checking" and will catch cases where a library file
has been updated w/o changing the tag. This patch re-enables checking previously done
except that now updates to config.nmake will also trigger the check.

svn path=/trunk/; revision=28722
2009-06-14 12:39:47 +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 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
Bill Meier 0ea6bce6af Escape ? in echo text the Windows way ....
svn path=/trunk/; revision=28616
2009-06-02 22:02:13 +00:00
Bill Meier cb4f0a40c2 Prevent "echo ? ... " from expanding ? as a file name pattern;
(Trivial) Remove duplicate xcopy of libwireshark.dll;
(Trivial) xcopy $(MSVCR_DLL) ...  only if newer.

svn path=/trunk/; revision=28528
2009-05-29 20:11:17 +00:00
Gerald Combs 6e689b5adc Update the Windows library tags and documentation filename.
svn path=/trunk/; revision=28527
2009-05-29 18:45:24 +00:00