Commit Graph

866 Commits

Author SHA1 Message Date
Anders Broman 9d85c3cf85 Revert file commited by mistake.
svn path=/trunk/; revision=40804
2012-02-02 06:54:33 +00:00
Anders Broman 0e927994bb Update the protocol name as per commit rev 40801.
svn path=/trunk/; revision=40802
2012-02-02 06:50:51 +00:00
Bill Meier 781d224ada Fix some Windows qmake and Qt Wireshark build issues:
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt;
Add '*.pdb' to QMAKE_CLEAN;
Fix 'Unescaped backslashes are deprecated' qmake warnings;
Remove "debug" message() statements from QtShark.pro.


svn path=/trunk/; revision=40797
2012-02-01 21:47:31 +00:00
Bill Meier e61e93baae Rework optional generation of .sbr & .bsc files.
svn path=/trunk/; revision=40779
2012-01-30 22:57:09 +00:00
Bill Meier 4308ba7dc5 Rework Windows Wireshark Qt build configuration a bit:
1. Compile and link with (almost exactly) the same options as used
   when building Windows Wireshark Gtk.
   The options used allow debugging of the exe using Visual Studio exactly
   as is done for Wireshark Gtk.
   Essentially: configure the "release" version to compile and link with
   symbols.  (See ui\qt\QtShark for the details).

2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt
   which is linked against the "release" Qt libraries.
   (IOW: don't create a "debug" Makefile).

3. Remove unused variable assignments from config.pri.
   (They can be added back if needed in the future).


svn path=/trunk/; revision=40768
2012-01-30 04:37:12 +00:00
Bill Meier 098725271f (Trivial) use same "Directory Separator" for dependency and target.
svn path=/trunk/; revision=40767
2012-01-30 00:57:44 +00:00
Anders Broman 087e6087f0 Part of "Build Browse Information File per default" from
Kovarththanan Rajaratnam applied.

It's still not the default but easier to make it so.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3480

svn path=/trunk/; revision=40765
2012-01-29 21:56:35 +00:00
Gerald Combs 377322404f Compile PortAudio if it's available.
svn path=/trunk/; revision=40708
2012-01-24 21:26:22 +00:00
Gerald Combs 463b3178e8 Add more configuration information to config.pri which lets us remove
more hard-coded definitions from QtShark.pro. Quote an error message to
fix a Qt Creator complaint.

Add ui\qt\config.pri to the top-level "all" nmake target.

Update README.qt.

svn path=/trunk/; revision=40607
2012-01-20 18:30:44 +00:00
Gerald Combs 0829150550 Try copying our plugins to an accessible directory. This assumes you've set
WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment.

On Windows, generate a QMake include file (config.pri) from config.nmake.

svn path=/trunk/; revision=40600
2012-01-20 01:10:40 +00:00
Guy Harris edad4a0d41 Another fixup for the move of win32 to ui\win32.
svn path=/trunk/; revision=40539
2012-01-16 02:37:06 +00:00
Guy Harris 0db1b9ae17 Make the win32 directory a subdirectory of the ui directory.
svn path=/trunk/; revision=40531
2012-01-16 01:26:46 +00:00
Guy Harris f9d7903641 The name of the target for ui/gtk/libui.lib is "gtk", not "ui\gtk".
svn path=/trunk/; revision=40526
2012-01-15 23:23:40 +00:00
Bill Meier a74de18f21 cd ../gtk ==> cd ../ui/gtk
svn path=/trunk/; revision=40525
2012-01-15 23:13:01 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00
Bill Meier b0a4df4022 Quote some filename usage.
svn path=/trunk/; revision=40397
2012-01-06 18:25:20 +00:00
Bill Meier 0600db677f Remove support for MSVC < MSVC2005; Update Developer's Guide.
svn path=/trunk/; revision=40395
2012-01-06 15:45:46 +00:00
Gerald Combs 5ce69a0445 Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2
directory.  This picks up any DEP/ASLR-related changes. Run peflags on
more DLLs.

svn path=/trunk/; revision=40317
2011-12-28 22:37:38 +00:00
Gerald Combs c9681dcb26 Add "peflags" to the list of required executables. Use it to make sure
the DLLs we use have DEP and ASLR enabled.

svn path=/trunk/; revision=40316
2011-12-28 20:29:13 +00:00
Gerald Combs 2aaa91c3fb From Pascal Quantin via bug 6593:
With Subversion 1.7, the working copy metada storage as changed (see
http://subversion.apache.org/docs/release-notes/1.7.html#wc-ng for details).
As a consequence, the file .svn/entries is no more updated and under Windows
the svnversion.h is no more regenerated (unless explicitely removed).
The attached patch fixes this issue so as to also check the .svn/wc.db file
date in the makefile rule.

Note that wc.db file must be checked before entries file as an upgrade of an
existing repository from subversion 1.6 to 1.7 leave an old entries file around
(that is no more updated).

In Makefile.am file, the svnversion.h file generation seems to be
systematically forced. So I guess Linux/Mac boxes are not impacted.

svn path=/trunk/; revision=39910
2011-11-17 19:41:36 +00:00
Gerald Combs 968f782d23 Link TShark with gthread.
svn path=/trunk/; revision=39791
2011-11-11 00:10:05 +00:00
Gerald Combs d40223b6fb Add a HAVE_GEOIP_V6 configuration option and enable it by default.
svn path=/trunk/; revision=39283
2011-10-05 23:02:31 +00:00
Jörg Mayer 576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER
as it is the only option left.

svn path=/trunk/; revision=39138
2011-09-25 21:27:19 +00:00
Gerald Combs cd7da58daa Add "--windowsonly" and "--cygwinonly" options to win-setup.sh
--appverify.  Make sure "mt" is only found in a normaly Windows path and
"find" is only found in a Cygwin path.

svn path=/trunk/; revision=38781
2011-08-29 19:22:42 +00:00
Anders Broman 65c3879f2d Install the GUI xml files. I'm not sure about the Makefile.am changes pkease check.
svn path=/trunk/; revision=38756
2011-08-28 15:08:31 +00:00
Gerald Combs ef6ddbd3e8 Add libwireshark.lib, libwsutil.lib, and wiretap-1.7.0.lib to the PDB
archive. Add libwsutil.pdb and sort a few items while we're here.

svn path=/trunk/; revision=38551
2011-08-15 22:00:21 +00:00
Guy Harris c7caf2f213 Add "distclean" and "maintainer-clean" rules to the docbook directory
Makefile.nmake.

Have "clean", "distclean", and "maintainer-clean" in the top-level
Makefile.nmake file clean out the docbook directory.

Add a "docbook" target to the top-level Makefile.nmake file.

svn path=/trunk/; revision=38468
2011-08-11 02:41:39 +00:00
Gerald Combs 17351102dd Add some distclean / clean targets.
svn path=/trunk/; revision=38457
2011-08-10 20:02:31 +00:00
Gerald Combs 1f497af628 Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
use WIRESHARK_LIB_DIR for the location of our external libraries.

svn path=/trunk/; revision=38119
2011-07-19 18:22:46 +00:00
Gerald Combs a533d70be0 On Windows enable threads everywhere instead of just in dumpcap. If
threads are enabled use them to check the recent file list. Fixes bug
3810.

svn path=/trunk/; revision=38033
2011-07-14 23:18:02 +00:00
Gerald Combs add36f416d Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows.

svn path=/trunk/; revision=37808
2011-06-27 20:48:26 +00:00
Gerald Combs 0501a48552 Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

svn path=/trunk/; revision=37778
2011-06-23 23:04:03 +00:00
Stig Bjørlykke 558cb4ee83 Set PCAP_NG_DEFAULT correct in config.h on win32.
svn path=/trunk/; revision=37697
2011-06-17 18:40:07 +00:00
Gerald Combs a24687ce8e Move the Windows argument list conversion code to a common routine.
svn path=/trunk/; revision=37372
2011-05-24 00:07:56 +00:00
Gerald Combs 3e2a422a83 Update the User's Guide.
svn path=/trunk/; revision=37312
2011-05-19 21:09:29 +00:00
Gerald Combs 99d4de66e5 From Dirk Jagdmann via bug 5875:
My attachment adds a link to a XSLT file to the preamble of the PDML.
The XSLT will transform the PDML to a HTML page, and the HTML page
features a look similar to Wireshark. See
http://cubic.org/~doj/ebay/a.pdml for an example.

The patch also contains a small perl program which converts the
Wireshark colortable into javascript code which is used in the XSLT
file. If you want to use a different color scheme you would execute the
perl program and insert the generated javascript function into your XSLT
file.

To view the HTML you could either place the PDML and XSLT file on your
webserver and verify that your webserver sends the PDML file as
"text/xml".  Then your webbrowser will find the linked XSLT file,
download that as well and convert the PDML to HTML on the fly.

You could also use an XSLT processor like xsltproc to convert the PDML
and XSLT into a static HTML file.


From me:

Minor fixups.

svn path=/trunk/; revision=37298
2011-05-19 18:10:21 +00:00
Chris Maynard 10ed235707 WANT_PACKET_EDITOR fixups for Windows.
svn path=/trunk/; revision=37091
2011-05-12 17:46:54 +00:00
Anders Broman 50e30e3c70 Make the use of UIManager a configure option.
NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072
2011-05-12 10:56:26 +00:00
Jeff Morriss be240d1de6 Oops, the Windows HAVE_GZCLEARERR stuff did work; take out the rest.
svn path=/trunk/; revision=36956
2011-04-29 18:30:16 +00:00
Anders Broman 3db53e54ba Build win64 with a modified zlib (google is your friend).
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0

First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51:
set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
(info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning.

svn path=/trunk/; revision=36616
2011-04-13 04:47:38 +00:00
Anders Broman b5125be726 Build with zlib-1.2.5 for win32
zlib for GTK hasd this comment:
/* LFS conventions have no meaning on Windows. Looking for feature
 * macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is
 * wrong. So make sure any such macros misguidedly defined by the
 * user have no effect. Windows has large file support, but the
 * official zlib DLL has not been built to provide the 64-bit offset
 * APIs, sigh.  So we have just patched out the 64-bit offset API
 * from this header file.
 */

svn path=/trunk/; revision=36586
2011-04-12 15:44:05 +00:00
Gerald Combs 92c8f32ff7 Use the latest library tag, which updates GNUTLS. Add code to check for
libintl-8.dll and add the GNUTLS version if needed.

svn path=/trunk/; revision=36483
2011-04-05 22:38:12 +00:00
Bill Meier dbc7c80782 Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer supports the old packet list)
svn path=/trunk/; revision=36165
2011-03-08 14:55:07 +00:00
Gerald Combs 16bacf2afc Comments have to be at the beginning of the line.
svn path=/trunk/; revision=36072
2011-02-25 17:17:41 +00:00
Anders Broman ee0df56d25 Verify tools fails if wireshark-win32-libs does not exist.
svn path=/trunk/; revision=36069
2011-02-25 15:10:35 +00:00
Guy Harris 0bb81b40d5 Apparently, if the argument to the cd command in an nmake file contains
spaces, it needs to be quoted, the fact that, if the argument to a cd
command typed at cmd.exe contains spaces, it *doesn't* need to be quoted
nonwithstanding.

svn path=/trunk/; revision=35987
2011-02-17 21:21:40 +00:00
Bill Meier d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +00:00
Bill Meier 483b52c8e7 Compile text2pcap.c,mergecap.c,capinfos.c,editcap.c, & version_info.c with -WX;
(Treat warnings as errors);
Done by simplifing the dependency line for the objects so that the
 default .c.obj inference rule is used.

svn path=/trunk/; revision=35564
2011-01-16 23:24:15 +00:00
Gerald Combs 3bc1fc3802 On Windows, convert all of our command-line arguments from UTF-16 to
UTF-8 where we don't already do so. In Wireshark use g_utf16_to_utf8
instead of utf_16to8. This should fix bug 5520.

svn path=/trunk/; revision=35411
2011-01-06 23:28:58 +00:00
Jaap Keuter bc31879963 Drop Python dissectors directory flag from programs that don't have dissectors.
Win32: remove superfluous dumpcap build dependancy on wiretap.

svn path=/trunk/; revision=35365
2011-01-04 22:12:25 +00:00