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