Gerald Combs
34e2a96d0b
Define NOMINMAX for the entire Qt build.
...
svn path=/trunk/; revision=51955
2013-09-11 19:59:22 +00:00
Gerald Combs
2dab57f425
Switch to make-services.py. Fix some variable names and version tests.
...
svn path=/trunk/; revision=51189
2013-08-07 16:33:39 +00:00
Anders Broman
78afe3fa82
Add a routine to get application memory usage to epan.
...
svn path=/trunk/; revision=51023
2013-07-30 05:49:58 +00:00
Graham Bloice
71921ced57
clean target misses some build artefacts; capinfos.lib and editcap.lib
...
svn path=/trunk/; revision=50972
2013-07-28 13:57:12 +00:00
Anders Broman
61e0e4d88c
Make it possible to use GetProcessMemoryInfo on Windows.
...
svn path=/trunk/; revision=50865
2013-07-24 15:54:55 +00:00
Gerald Combs
a692824160
GeoIP 1.5.1.
...
svn path=/trunk/; revision=50742
2013-07-20 01:01:55 +00:00
Jeff Morriss
54bb2e7a5c
Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
...
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Jeff Morriss
4dcc156cf3
Move the print modules into epan.
...
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +00:00
Chris Maynard
d602662b36
Add strnatcmp by Martin Pool for 'natural order' string comparisons, and make use of it in editcap and mergecap for listing encapsulation types. For example:
...
Before:
user0 - USER 0
user1 - USER 1
user10 - USER 10
user11 - USER 11
user12 - USER 12
user13 - USER 13
user14 - USER 14
user15 - USER 15
user2 - USER 2
user3 - USER 3
user4 - USER 4
user5 - USER 5
user6 - USER 6
user7 - USER 7
user8 - USER 8
user9 - USER 9
After:
user0 - USER 0
user1 - USER 1
user2 - USER 2
user3 - USER 3
user4 - USER 4
user5 - USER 5
user6 - USER 6
user7 - USER 7
user8 - USER 8
user9 - USER 9
user10 - USER 10
user11 - USER 11
user12 - USER 12
user13 - USER 13
user14 - USER 14
user15 - USER 15
svn path=/trunk/; revision=50482
2013-07-10 16:18:37 +00:00
Jeff Morriss
fd95d841b8
Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
...
./configure now accepts:
--with-gtk2 : enabled by default; exclusive of --with-gtk3
--with-gtk3 : disabled by default; exclusive of --with-gtk2
--with-qt : disabled by default, can be specified with gtk
--enable-wireshark : controls whether *any* GUI is built
If Qt is enabled then a new program is created: "wireshark-qt". "wireshark"
remains the Gtk+ version.
svn path=/trunk/; revision=50147
2013-06-25 19:51:53 +00:00
Chris Maynard
ce088c334d
makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
...
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Pascal Quantin
bc78191e31
Upgrade user manual
...
svn path=/trunk/; revision=49634
2013-05-30 20:13:56 +00:00
Chris Maynard
7224a27220
Correct the c-ares directory name in the clean_setup target.
...
#BACKPORT(1.10)
svn path=/trunk/; revision=49616
2013-05-29 15:41:57 +00:00
Chris Maynard
34fdcb7b64
Add dftest.exe to EXECUTABLES. For clean-local target, clean randpkt.exe, not randpkt.ext.
...
svn path=/trunk/; revision=49514
2013-05-22 17:46:17 +00:00
Gerald Combs
4b4542045c
Install and uninstall our global profiles.
...
svn path=/trunk/; revision=49123
2013-05-01 22:06:49 +00:00
Gerald Combs
7613251d1c
Switch to WinPcap 4.1.3.
...
svn path=/trunk/; revision=48207
2013-03-09 01:20:09 +00:00
Gerald Combs
ac364779f7
Switch to c-ares 1.9.1.
...
svn path=/trunk/; revision=48191
2013-03-08 16:51:21 +00:00
Pascal Quantin
c2862992b9
Revert part of r48021: those hunks are no more needed with r48170
...
svn path=/trunk/; revision=48171
2013-03-07 17:39:20 +00:00
Gerald Combs
29ceca1b26
From Balint:
...
[PATCH 1/2] Revert "Try to fix the "LNK4217: locally defined symbol"
warnings.
This reverts commit r48158.
[PATCH 2/2] Employ small hack in editcap to link with a few objects from
libwireshark properly
From me:
Add the ability to reset symbol exports via ws_symbol_export.h's include
guard and do so in capinfos.c and editcap.c. We include ws_symbol_export.h
in over 200 files so it didn't seem to make sense to remove its include
guard entirely.
svn path=/trunk/; revision=48170
2013-03-07 17:20:12 +00:00
Gerald Combs
7e8c551af0
Try to fix the "LNK4217: locally defined symbol" warnings.
...
svn path=/trunk/; revision=48158
2013-03-07 00:16:32 +00:00
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