4c08d75359
Try to get text2pcap building on Windows.
...
svn path=/trunk/; revision=46675
2012-12-21 14:59:41 +00:00
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
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
96f889dfd6
Update the User's Guide to 1.9
...
svn path=/trunk/; revision=46503
2012-12-11 22:23:44 +00:00
843864684c
Update the User's Guide to 1.8
...
svn path=/trunk/; revision=46463
2012-12-07 22:40:04 +00:00
64c46ea482
Make it easier to switch between GTK2 and GTK3.
...
svn path=/trunk/; revision=46082
2012-11-19 19:29:36 +00:00
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
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
46484ff0f7
Start making the program name "wireshark" configurable.
...
svn path=/trunk/; revision=45558
2012-10-15 15:31:20 +00:00
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
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
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
95cbbe48d4
Fix mispelling of reordercap.exe target.
...
svn path=/trunk/; revision=45093
2012-09-24 10:53:06 +00:00
60fb63783a
From Jim Young, bug 7745.
...
Add Makefile support for reordercap.
svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
4a57360291
Use guilibsdll and htmlhelp.lib in the Qt build.
...
svn path=/trunk/; revision=44996
2012-09-19 00:47:31 +00:00
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
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
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
353823a2df
Minor tweek for GTK3
...
svn path=/trunk/; revision=44887
2012-09-13 05:29:53 +00:00
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
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
b10b774bc6
Make sure xcopy can figure things out on its own.
...
svn path=/trunk/; revision=43979
2012-07-25 00:47:11 +00:00
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
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
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
bdea70585d
Use win32_open_file in qtshark on Windows.
...
svn path=/trunk/; revision=43677
2012-07-12 00:04:53 +00:00
9e1359e2fa
Revert 43481: linking dftest against libui was not the problem.
...
svn path=/trunk/; revision=43488
2012-06-25 22:21:58 +00:00
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
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
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
1785ed1ee0
Try to fix tarball compilation on Windows.
...
svn path=/trunk/; revision=43428
2012-06-21 17:35:59 +00:00
41232f172e
Remove HAVE_WIRELESS_TOOLBAR from the other build systems.
...
svn path=/trunk/; revision=43419
2012-06-20 19:11:55 +00:00
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
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
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
e63f70cfc2
Add the GeoIP DLL.
...
svn path=/trunk/; revision=43128
2012-06-05 23:43:02 +00:00
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
7b43b3de0f
Make it possible to build with GTK3 on Windows
...
svn path=/trunk/; revision=43083
2012-06-04 20:42:09 +00:00
2b1f885ce9
No more GIOP plugins, no more GIOP plugin directory.
...
svn path=/trunk/; revision=42980
2012-06-01 17:10:09 +00:00
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
3ea4fe2c4a
Back out previous change.
...
svn path=/trunk/; revision=42907
2012-05-30 00:11:11 +00:00
18ac3d94ee
Extract into the right directory.
...
svn path=/trunk/; revision=42906
2012-05-30 00:04:03 +00:00
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
992587c3bf
Try using an OBS-derived Gtk2 bundle, second try.
...
svn path=/trunk/; revision=42623
2012-05-14 17:54:47 +00:00
2c996e9c18
Make it possible to download the GTK3 package
...
svn path=/trunk/; revision=42174
2012-04-21 08:45:52 +00:00
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
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
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
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
e19fa8063e
Give qmake a VERSION it will accept.
...
svn path=/trunk/; revision=41762
2012-03-25 21:27:49 +00:00
Michael Tüxen