Commit Graph

1030 Commits

Author SHA1 Message Date
Gerald Combs 5378455e7a Don't define WS_BUILD_DLL when building capinfos and editcap. In the case
of capinfos this breaks getopt because optind isn't properly imported.

svn path=/trunk/; revision=48072
2013-03-04 22:49:23 +00:00
Pascal Quantin fc9156a8a0 Try to fix LNK4217 (locally defined symbol imported in function) and C4273 (inconsistent DLL linkage) warnings when compiling for Windows
svn path=/trunk/; revision=48021
2013-03-02 22:19:33 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Gerald Combs e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Chris Maynard 2bd7b33a0e Copy over any mibs that might be in the site directory.
svn path=/trunk/; revision=46987
2013-01-07 19:44:33 +00:00
Bill Meier e3b03c9c25 Remove redundant SUBSYSTEM link option from link commands.
[ $(guiflags) or $(conflags) specified as part of the link options
  includes the SUBSYSTEM option ].

svn path=/trunk/; revision=46831
2012-12-28 21:21:34 +00:00
Michael Tüxen 6c1435408e This should get it building on Windows.
svn path=/trunk/; revision=46676
2012-12-21 15:03:35 +00:00
Michael Tüxen 4c08d75359 Try to get text2pcap building on Windows.
svn path=/trunk/; revision=46675
2012-12-21 14:59:41 +00:00
Michael Tüxen 0461a705c0 text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).
svn path=/trunk/; revision=46600
2012-12-18 22:56:06 +00:00
Michael Mann a37f60e4f6 Bug 3528 - When following an HTTP tcp stream decode gzip data automatically (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528)
includes patch from bug (with actual functionality) + changes to makefiles to make it compile/link on Windows

svn path=/trunk/; revision=46530
2012-12-13 19:59:57 +00:00
Pascal Quantin 96f889dfd6 Update the User's Guide to 1.9
svn path=/trunk/; revision=46503
2012-12-11 22:23:44 +00:00
Pascal Quantin 843864684c Update the User's Guide to 1.8
svn path=/trunk/; revision=46463
2012-12-07 22:40:04 +00:00
Anders Broman 64c46ea482 Make it easier to switch between GTK2 and GTK3.
svn path=/trunk/; revision=46082
2012-11-19 19:29:36 +00:00
Gerald Combs b924cfed2b The U3 and PortableApps packaging processes depend on simple
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.

svn path=/trunk/; revision=45659
2012-10-19 17:47:34 +00:00
Gerald Combs 20fa5a8774 Add PROGRAM_NAME and INSTALL_DIR to ui\qt\config.pri. Currently unused.
svn path=/trunk/; revision=45561
2012-10-15 16:07:07 +00:00
Anders Broman 46484ff0f7 Start making the program name "wireshark" configurable.
svn path=/trunk/; revision=45558
2012-10-15 15:31:20 +00:00
Anders Broman 1f867e7901 Include setup.ini in the tarball.
Copy setup.ini to etc/gtk-3.0

svn path=/trunk/; revision=45497
2012-10-12 12:36:22 +00:00
Chris Maynard 005175c9c4 Revert 45116. Developer's probably don't want the user-guide.chm that they get from the setup step as it's not going to be up-to-date.
svn path=/trunk/; revision=45121
2012-09-25 03:23:23 +00:00
Chris Maynard 410fdcd065 We're downloading the user-guide as part of the setup, so we might as well copy it to the install directory. If someone has built a more up-to-date version of the user-guide in the docbook directory, then it will just overwrite this one, but for most developers, I don't think they're building their own, so at least this way they'll still have a local copy of the user-guide. If optional is the preferred default, then we can change config.nmake and just comment out UG_DIR and mark as "optional" instead of "recommended".
svn path=/trunk/; revision=45116
2012-09-25 01:03:21 +00:00
Martin Mathieson 95cbbe48d4 Fix mispelling of reordercap.exe target.
svn path=/trunk/; revision=45093
2012-09-24 10:53:06 +00:00
Martin Mathieson 60fb63783a From Jim Young, bug 7745.
Add Makefile support for reordercap.

svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
Gerald Combs 4a57360291 Use guilibsdll and htmlhelp.lib in the Qt build.
svn path=/trunk/; revision=44996
2012-09-19 00:47:31 +00:00
Jeff Morriss d8a0279ea0 From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 :
Add VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO to the config.h on
Windows (actually Chris' patch included VERSION_BUILD and VERSION_EXTRA but
I've left those out to match what we have on *NIX now).

svn path=/trunk/; revision=44988
2012-09-18 21:52:00 +00:00
Anders Broman 055736b655 Compile and install schemas if GTK3 is used, nsis needs update too
svn path=/trunk/; revision=44923
2012-09-16 09:55:44 +00:00
Gerald Combs 1b1a1e6a3e Remove our local copy of WinPcap and download it from
wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip
files ending in .zip. PortableApps and U3 packaging changes are untested.

svn path=/trunk/; revision=44888
2012-09-13 21:28:28 +00:00
Anders Broman 353823a2df Minor tweek for GTK3
svn path=/trunk/; revision=44887
2012-09-13 05:29:53 +00:00
Gerald Combs f2789cbb34 Copy over the C runtime DLLs if MSVCR_DLL is defined.
svn path=/trunk/; revision=44544
2012-08-16 19:37:01 +00:00
Gerald Combs f414b3cae3 Revert parts of r43978 and r43976 so that we can catch updates in
subdirectories.

svn path=/trunk/; revision=44014
2012-07-25 21:08:44 +00:00
Gerald Combs b10b774bc6 Make sure xcopy can figure things out on its own.
svn path=/trunk/; revision=43979
2012-07-25 00:47:11 +00:00
Gerald Combs 6d0149175a Make sure wireshark.exe and tshark.exe don't depend on pseudotargets.
svn path=/trunk/; revision=43978
2012-07-25 00:37:29 +00:00
Gerald Combs f25ae3613a Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
files in wireshark-gt2 unnecessarily.

svn path=/trunk/; revision=43976
2012-07-24 23:59:42 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695)
svn path=/trunk/; revision=43844
2012-07-20 01:21:27 +00:00
Gerald Combs bdea70585d Use win32_open_file in qtshark on Windows.
svn path=/trunk/; revision=43677
2012-07-12 00:04:53 +00:00
Jeff Morriss 9e1359e2fa Revert 43481: linking dftest against libui was not the problem.
svn path=/trunk/; revision=43488
2012-06-25 22:21:58 +00:00
Anders Broman e6e6d6217b From Tony Trinh:
Update Lua from 5.1 to 5.2

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

svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
Jeff Morriss 8eeebf73e0 Move get_args_as_string from ui/util.c into wsutil (maybe not to the best
module, but...).

This makes dftest no longer dependent on libui, so stop linking against it.

svn path=/trunk/; revision=43481
2012-06-25 20:38:45 +00:00
Guy Harris 204ea39c5d Move a bunch of common code in the file chooser dialog loops into a
routine to run a file chooser dialog.

On Windows, add to that code to resolve shell links ("shortcuts"),
adopted from the Sylpheed mail reader.  (That code requires a pile of
OLE stuff, so link with the OLE library.)

Make it a bit easier to configure ui/gtk/capture_file_dlg.c to use GTK+
dialogs on Windows, but continue to default to using the Win32 dialogs,
at least for now.

svn path=/trunk/; revision=43439
2012-06-21 22:21:02 +00:00
Gerald Combs 1785ed1ee0 Try to fix tarball compilation on Windows.
svn path=/trunk/; revision=43428
2012-06-21 17:35:59 +00:00
Jörg Mayer 41232f172e Remove HAVE_WIRELESS_TOOLBAR from the other build systems.
svn path=/trunk/; revision=43419
2012-06-20 19:11:55 +00:00
Anders Broman 227eb36c83 Start to have an generic wireless toolbar. Sligtly modified patch from
Pontus Fuchs.

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

svn path=/trunk/; revision=43354
2012-06-19 12:42:06 +00:00
Bill Meier db25589d90 Add a comment as to .bsc files seemingly not usable with VS2010.
svn path=/trunk/; revision=43232
2012-06-13 16:18:38 +00:00
Bill Meier a519001f02 wireshark.bsc dependencies: fix a typo; add 2 which are missing.
svn path=/trunk/; revision=43229
2012-06-13 14:42:30 +00:00
Gerald Combs e63f70cfc2 Add the GeoIP DLL.
svn path=/trunk/; revision=43128
2012-06-05 23:43:02 +00:00
Gerald Combs 95e53ff7ab Pass WTAP_VERSION to Qt. (WTAP_VERSION should probably match the GNU
toolchain version but that's a separate issue.)

svn path=/trunk/; revision=43124
2012-06-05 18:37:32 +00:00
Anders Broman 7b43b3de0f Make it possible to build with GTK3 on Windows
svn path=/trunk/; revision=43083
2012-06-04 20:42:09 +00:00
Guy Harris 2b1f885ce9 No more GIOP plugins, no more GIOP plugin directory.
svn path=/trunk/; revision=42980
2012-06-01 17:10:09 +00:00
Pascal Quantin c8b19701bf Clean GeoIP-1.4.8-*-win??ws folder with setup target
svn path=/trunk/; revision=42938
2012-05-31 08:08:44 +00:00
Gerald Combs 3ea4fe2c4a Back out previous change.
svn path=/trunk/; revision=42907
2012-05-30 00:11:11 +00:00
Gerald Combs 18ac3d94ee Extract into the right directory.
svn path=/trunk/; revision=42906
2012-05-30 00:04:03 +00:00
Gerald Combs 43670460ff Use GeoIP 1.4.8 which includes a DLL instead of a static library.
svn path=/trunk/; revision=42905
2012-05-29 23:31:00 +00:00
Gerald Combs 992587c3bf Try using an OBS-derived Gtk2 bundle, second try.
svn path=/trunk/; revision=42623
2012-05-14 17:54:47 +00:00
Anders Broman 2c996e9c18 Make it possible to download the GTK3 package
svn path=/trunk/; revision=42174
2012-04-21 08:45:52 +00:00
Gerald Combs 733834afdb Switch back to the gtk.org version of the GTK+ bundle since its Cairo
doesn't crash.

svn path=/trunk/; revision=42171
2012-04-20 23:41:36 +00:00
pascal c06cea707c Clean gnutls-2.12.18-*-win??ws folder with setup target
svn path=/trunk/; revision=42170
2012-04-20 19:56:17 +00:00
Gerald Combs d8389b5429 Switch to our custom GTK+ bundles derived from openSUSE Build Service
packages. Sort and normalize our DLL lists. Add several new required DLLs.

svn path=/trunk/; revision=42143
2012-04-19 18:31:11 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Gerald Combs e19fa8063e Give qmake a VERSION it will accept.
svn path=/trunk/; revision=41762
2012-03-25 21:27:49 +00:00
Gerald Combs 6f5273e81e Fix the Qt build for Win64.
svn path=/trunk/; revision=41761
2012-03-25 19:01:58 +00:00
Gerald Combs 98080036b6 Capitalize "Wireshark" in various package names.
svn path=/trunk/; revision=41621
2012-03-16 17:36:40 +00:00
Bill Meier 78f602dc9b CVARSDLL hasn't been used (is undefined) for a while....
(This commit should have been part of SVNB #41180).

svn path=/trunk/; revision=41254
2012-03-01 02:53:38 +00:00
Bill Meier 767ec314a0 Update clean_setup list of win32-libs to be deleted.
svn path=/trunk/; revision=41252
2012-03-01 02:43:07 +00:00
Guy Harris 2ae289a62e Build the TShark taps into a static libcliui library in the ui/cli
directory, and link TShark with that; let's see if this fixes the
Windows buildbots.

svn path=/trunk/; revision=41070
2012-02-19 19:01:01 +00:00
Guy Harris 530c8c5390 Create a libui (static) library in the ui directory, which contains the
object files from all the source files in the ui directory (but not in
its subdirectories), and link the programs that need it with them.

This cleans things up a little bit, and may also fix the Windows build.

svn path=/trunk/; revision=41061
2012-02-18 23:55:41 +00:00
Guy Harris 67186dfc6e Rename the (static) library built from stuff in ui/gtk to "libgtkui" in
automake/autoconf and nmake builds, to match the name in CMake builds.

(Forgot Makefile.nmake.)

svn path=/trunk/; revision=41059
2012-02-18 20:24:54 +00:00
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
Jaap Keuter 3656ecb823 Free dumpcap from linking to wiretap.
svn path=/trunk/; revision=35353
2011-01-04 07:06:01 +00:00
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