Commit Graph

1082 Commits

Author SHA1 Message Date
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 b5d1f49dfc Remove the dependency on tools/make-services.pl for the services target.
This is likely the cause of unwanted "services" file build attempts.

svn path=/trunk/; revision=41853
2012-03-30 17:53:23 +00:00
Guy Harris fd72ad5e92 Automake can, at times, be a delicate fragile flower. Apparently,
having something in wireshark_LDADD that's filled in by the configure
script means that the items referred to by that string aren't treated as
dependencies.

svn path=/trunk/; revision=41709
2012-03-21 06:13:53 +00:00
Guy Harris 73ca54d870 Said hack didn't work.
svn path=/trunk/; revision=41665
2012-03-19 07:24:14 +00:00
Guy Harris 1ff3d8477f Call the UI library in the Qt directory libqtui, not libui, to match the
UI library in the GTK+ directory.

List the moc-generated and rcc-generated files as generated files.

Add main_window.ui as an EXTRA_DIST file.  Sort the EXTRA_DIST list.

svn path=/trunk/; revision=41658
2012-03-19 06:29:41 +00:00
Guy Harris 16b1d14f30 Take the source files out of uiqt_DATA.
svn path=/trunk/; revision=41649
2012-03-18 23:49:44 +00:00
Guy Harris 994d2b544e Add automake support for Qt - use --with-qt as a configure script
argument.

svn path=/trunk/; revision=41647
2012-03-18 23:35:53 +00:00
Michael Tüxen 4e58ec540f Update to glib 2.31.20.
One patch is not required anymore, since it has been included.

svn path=/trunk/; revision=41546
2012-03-14 16:56:20 +00:00
Guy Harris 7676b02551 Reflect the rename of the Xylan RADIUS dictionary.
svn path=/trunk/; revision=41476
2012-03-10 19:05:46 +00:00
Guy Harris fbfb21931f Put more stuff from images into the release tarball.
svn path=/trunk/; revision=41420
2012-03-08 06:19:09 +00:00
Guy Harris 9c2cb97d1a And one more image file.
svn path=/trunk/; revision=41408
2012-03-07 21:48:08 +00:00
Guy Harris ace51f3c9d Include the new images in the release tarball.
svn path=/trunk/; revision=41407
2012-03-07 21:46:58 +00:00
Guy Harris 4a20fd003c We need to build libui even if we're only building TShark. Fixes bug
6855.

svn path=/trunk/; revision=41131
2012-02-22 02:15:23 +00:00
Guy Harris 280f14476b ui/cli now needs to be a distribution directory.
svn path=/trunk/; revision=41072
2012-02-19 19:30:45 +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 89a5b93d98 ui/gtk/main.c calls get_conn_cfilter(), which is defined in ui/util.c,
so we need to link libui *after* libgtkui.  (It worked on Mac OS X, but
the OS X linker might do things differently from the GNU linker.)

svn path=/trunk/; revision=41063
2012-02-19 00:19:35 +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 bdab9be898 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.

svn path=/trunk/; revision=41058
2012-02-18 20:21:30 +00:00
Anders Broman 86b6c80128 Add the Qt files to the tarball.
svn path=/trunk/; revision=40745
2012-01-28 09:18:26 +00:00
Michael Tüxen 3e1a0cacaf Sync checkapi target with Makefile.common.
svn path=/trunk/; revision=40630
2012-01-21 12:29:05 +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
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
Balint Reczey f15662eaa6 Unconditionally install idl2wrs
svn path=/trunk/; revision=39985
2011-11-22 13:53:17 +00:00
Balint Reczey f0642db264 hardcode /bin/sh to idl2wrs
svn path=/trunk/; revision=39984
2011-11-22 13:53:06 +00:00
Gerald Combs 3f12c48ace Add an SVN_REVISION variable to config.nmake. This can be used to
retrieve our SVN revision in releases.

Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:

  - Fetching the SVN revision which corresponds to our code. The
    revision can be fetched via "svn info", "git svn info", SubWCRev",
    config.nmake, or by prodding .svn.

  - Setting the version numbers (the "major.minor.micro" triplet).

  - Setting the release information (revision/build number, local build
    identifier)

Remove the "is_release" configuration option and dist-hook target.

When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.


svn path=/trunk/; revision=39891
2011-11-17 00:19:03 +00:00
Guy Harris 21688e4e46 We have to remove svnversion.h with "make distclean".
svn path=/trunk/; revision=39720
2011-11-02 20:21:11 +00:00
Guy Harris 68e4d887d2 The answer to
XXX - "svnversion.h" is distributed in the release tarball; should
	we be deleting it with "make clean", or should we only do that with
	"make maintainer-clean"?

is probably "we should only do that with "make maintainer-clean""; see

	http://www.wireshark.org/lists/wireshark-dev/201111/msg00027.html

and followups.

svn path=/trunk/; revision=39716
2011-11-02 18:16:26 +00:00
Gerald Combs 601198e4fe Forward-port r39581 from the 1.6 trunk.
svn path=/trunk/; revision=39582
2011-10-25 22:03:54 +00:00
Gerald Combs 920eaae369 In dist-hook, don't try to copy version.conf if it already exists in the
destination directory.

svn path=/trunk/; revision=39572
2011-10-25 19:04:26 +00:00
Michael Tüxen 66517c8e57 Use one of the new icons for remote interfaces.
svn path=/trunk/; revision=39118
2011-09-24 12:39:09 +00:00
Jeff Morriss 14ab9387c1 Revert rev 38340 (which was itself a reversion of 34807): if we can't find the
SVN version, indicate that the SVN version is unknown.  This puts back the fix
for bug 1413.

Add a new version.conf option for make-version which tell is "this is a build
from a release tarball."  When that option is present do not try to use SVN
to determine the SVN version, just use whatever SVN information shipped in the
tarball.

If version.conf is present in the source tree (as it is only in the release
branches), deliver it in the source tarball but only after setting the "this
is a release tarball" option.


All of this means that that builds from release-branch tarballs will report
the SVN version of the release tarball rather than "unknown."  This addresses
the issue reported in
http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown

Builds from trunk (including the source tarballs) will continue to report that
the SVN version is unknown.  (Maybe that, too, should be changed?)

svn path=/trunk/; revision=38933
2011-09-08 01:53:41 +00:00
Stig Bjørlykke fb215b5fa5 Remove tree-view-ui.xml and bytes-view-ui.xml
svn path=/trunk/; revision=38815
2011-08-31 10:01:45 +00:00
Guy Harris 05925d1e4c Escape the newlines in the definition of ui_DATA.
svn path=/trunk/; revision=38763
2011-08-28 19:26:03 +00:00
Anders Broman a08c67c558 Add the main menubar UI description.
svn path=/trunk/; revision=38762
2011-08-28 18:34:52 +00:00
Anders Broman 3b203417d5 Add the treeView popup UI description.
svn path=/trunk/; revision=38760
2011-08-28 16:18:58 +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
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Jörg Mayer 933e244498 Add missing FindGTK3.cmake
Reorder cmake modules to match directory listing order

svn path=/trunk/; revision=38153
2011-07-21 20:50:51 +00:00
Guy Harris 9659cc77e8 Patch GnuTLS's pkg-config file; it says "requires zlib", but OS X, while
it supplies zlib, doesn't supply a pkgconfig file for it, so we don't
want it to say "requires zlib".

This script is part of the Wireshark source, so giving "download
Wireshark source" as the next step doesn't make sense.

svn path=/trunk/; revision=38055
2011-07-15 23:26:22 +00:00
Guy Harris b273aad66e Add Joerg Mayer's macos-setup.sh script, modified to add an "x" after
"macos", to fix some bugs, to use "sudo" if necessary when installing,
to make the library version numbers variables, and to download the
optional libraries, by default, as well.  Also add his patches to make
GLib build and work.

Update README.macos to reflect that.

svn path=/trunk/; revision=38053
2011-07-15 21:48:02 +00:00
Stig Bjørlykke 54e59e8cdd Remove compile and ylwrap when 'make maintainer-clean'.
svn path=/trunk/; revision=37797
2011-06-27 08:38:37 +00:00
Guy Harris 350ec69e9a Do the Python embedding similarly to other "default = yes, if available"
items.

Add some quoting to the zlib tests, just in case the argument contains
white space.

Clean up capitalization of Lua and Python.

Link programs that use libwireshark with the Python libraries, and build
Epan with the Python cflags.

svn path=/trunk/; revision=37652
2011-06-11 19:05:17 +00:00
Anders Broman 85195d1e02 From Madhusudhan M:
Cisco and Vodafone Diameter AVP:s

I have axtracted the relevant vendor AVP:s and separated them out in Vendor specific xml files.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5972

svn path=/trunk/; revision=37627
2011-06-09 06:36:40 +00:00
Anders Broman afb0e8b434 From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005

svn path=/trunk/; revision=37610
2011-06-08 05:20:43 +00:00
Anders Broman d8e1b0d3d5 Move packet-sercosiii.c to be a builtin dissector.
svn path=/trunk/; revision=37597
2011-06-07 20:33:26 +00:00
Anders Broman 1932ff6734 Add more missing files.
svn path=/trunk/; revision=37593
2011-06-07 15:05:45 +00:00
Anders Broman 1ec3c2e6fd Add files to distribution.
svn path=/trunk/; revision=37589
2011-06-07 14:15:50 +00:00
Gerald Combs ec3f19face Add abi-descriptor.template to the distribution.
svn path=/trunk/; revision=37490
2011-05-31 20:45:28 +00:00
Balint Reczey ad2d4694df Add top-level dumpabi target.
svn path=/trunk/; revision=37476
2011-05-31 14:33:49 +00:00
Anders Broman 51d8ad3a45 Remove some stuff again.
svn path=/trunk/; revision=37437
2011-05-27 13:16:28 +00:00