Commit Graph

765 Commits

Author SHA1 Message Date
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
Bill Meier 96505bc99d Version 2: Fix bug: Makefile doesn't detect some out-of-date libraries.
The previous fix (SVN 28504) didn't quite work since
 nmake always errored out if the libraries were not up-to-date; this 
 prevented doing an nmake ... setup.

 This version of the fix:
 1. Gets the library status (checktag) at the beginning of the make.
 2. Effectively does the actual testing of the status whenever 
    a target with $(LIBS_CHECK) as a dependency is invoked.

 Result: nmake ... [all] will error-out while nmake .... setup will
  work properly.

 Note that nmake ... setup will now show an initial error message
  (from checktag) if the libraries are out of date; setup will still 
  proceed normally.
  This is a slight change from the current behavior wherein no
  error message occurs when nmake ... setup is invoked when the
  libraries are out of date.

svn path=/trunk/; revision=28516
2009-05-28 23:20:20 +00:00
Bill Meier 2223888b20 Add missing quote
svn path=/trunk/; revision=28505
2009-05-27 17:13:07 +00:00
Bill Meier 582e9cb3a4 Fix bug: Makefile doesn't detect some out-of-date libraries.
Reason:
 The makefile was coded to do the checktag and libverify checks
 only if makefile.nmake changed. It's now the case that some 
 library updates are reflected in config.nmake rather than in
 Makefile.nmake and thus were missed.

Solution:
 Do a checktag once at the beginning of the make.
 Do not do a libverify any more. I think that checking
  that the library 'tag' is correct is sufficient.
 (The libverify code has been effectively commented out for now. 
  It can be removed at a later date once we're comfortable
  with just using checktag).
 --This line, and those below, will be ignored--

M    Makefile.nmake

svn path=/trunk/; revision=28504
2009-05-27 17:07:51 +00:00
Tomas Kukosa 0a101aacf6 Make gtk/capture_if_details_dlg_win32.c compileable using MSVC6 with SDK
svn path=/trunk/; revision=28314
2009-05-08 19:53:41 +00:00
Gerald Combs 7b3b6ed3f9 Check for the existence of a couple of directories and add variables for DLL
names.

svn path=/trunk/; revision=28070
2009-04-16 21:34:44 +00:00
Gerald Combs e648060f0f Fix the last(?) of the Win64 compilation problems.
svn path=/trunk/; revision=28065
2009-04-16 04:05:39 +00:00
Anders Broman db6795dc82 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27796
2009-03-19 06:42:46 +00:00
Anders Broman e7ccbd26d1 Revert the changes, it blows up when resizeing windows...
svn path=/trunk/; revision=27764
2009-03-17 21:33:15 +00:00
Anders Broman 2a6752e050 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27762
2009-03-17 20:21:16 +00:00
Bill Meier b3f428acb4 Do checkAPIs for wireshark_SOURCES
svn path=/trunk/; revision=27754
2009-03-17 15:39:07 +00:00
Gerald Combs cf7fb3ea9c Port rdps from C to Python. This makes it easier to cross-compile
Wireshark on Windows. The GNU toolchain changes have not been tested.

svn path=/trunk/; revision=27704
2009-03-11 22:12:05 +00:00
Gerald Combs 0d446ae826 Use WIRESHARK_TARGET_PLATFORM instead of PLATFORM.
svn path=/trunk/; revision=27701
2009-03-11 16:13:17 +00:00
Bill Meier 0af6e6e23a Enable checkAPIs on gtk/...
(I believe all the errors for gtk/... have been fixed);
 Next up: Add the complete list of deprecated
   GTK APIs to checkAPIs.pl

svn path=/trunk/; revision=27681
2009-03-09 20:29:09 +00:00
Bill Meier a910aed306 gettext library setup: Fix a bug and adjust config slightly for win32 so
gettext setup works the way I think was intended.

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

svn path=/trunk/; revision=27633
2009-03-07 01:06:40 +00:00
Gerald Combs db37f3cecf Try using the MSVCRT version of Lua (lua5_1_4_Win32_dll6_lib) for
all builds.

svn path=/trunk/; revision=27465
2009-02-16 17:27:12 +00:00
Ulf Lamping f8e5b17dbd add support for a simple GeoIP based IP Location Map, more details will follow on the dev-list
svn path=/trunk/; revision=27433
2009-02-11 20:25:17 +00:00
Ulf Lamping 67efa1ca84 we don't need to copy rawshark.exe.manifest, as this manifest is integrated using mt.exe
svn path=/trunk/; revision=27403
2009-02-09 19:38:15 +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
Anders Broman 7c48128948 Revert previous checkin.
svn path=/trunk/; revision=27356
2009-02-02 22:16:46 +00:00
Anders Broman d92ab193f5 Use Python to build tshark-tap-register.c
svn path=/trunk/; revision=27355
2009-02-02 21:22:01 +00:00
Ulf Lamping 7eae5480fb trying to "inject" commands into xcopy doesn't work on international windows version. You simply can't answer the question "Datei oder Verzeichnis" with the key 'f' ;-)
Replace this with the triple: "copy, if exist delete, rename" which isn't very nice but at least works on all machines

svn path=/trunk/; revision=27325
2009-01-29 01:31:11 +00:00
Anders Broman 2b3540be16 Use Glib 2.18-4 GTK+ 2.14.7 and Cairo 1.8.6.
svn path=/trunk/; revision=27226
2009-01-13 23:21:19 +00:00
Tomas Kukosa e22d7c79eb display runtime versions of GnuTLS and Gcrypt libraries
svn path=/trunk/; revision=27194
2009-01-08 13:24:04 +00:00
Gerald Combs 8395f0ef02 As suggested by Joerg a while back, get rid of FAQ in the build directory.
Copy help/faq.txt to FAQ in the NSIS and zip packages.

Add "help" to the dependency list for "all". Fix a couple of minor bugs
in the top-level Makfile.nmake.

svn path=/trunk/; revision=27173
2009-01-06 21:47:19 +00:00
Anders Broman 57d4f179fd Use the install-plugins target.
svn path=/trunk/; revision=27125
2008-12-29 15:12:04 +00:00
Anders Broman 960cd2feee Use GTK+ 2.14.6
svn path=/trunk/; revision=27121
2008-12-27 16:24:16 +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