Commit Graph

1060 Commits

Author SHA1 Message Date
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
Anders Broman df7717126d Include missing files in distribution.
svn path=/trunk/; revision=37435
2011-05-27 12:22:20 +00:00
Anders Broman 16a6cdcd76 Add FindGMODULE2.cmake and FindGTHREAD2.cmake to the dist.
svn path=/trunk/; revision=37409
2011-05-26 14:23:40 +00:00
Bill Meier 467cb54139 Add new dictionary from freeradius.org: GIT 2.1.x branch.
svn path=/trunk/; revision=37385
2011-05-25 00:40:35 +00:00
Bill Meier 9e31617933 Update list of radius dictionary files to reflect adds/deletes.
svn path=/trunk/; revision=37380
2011-05-24 19:13:04 +00:00
Guy Harris 50330f2dbd Add pdml2html.xsl to the source tarball.
(Can we have a macro that has everything in pkgdata_DATA except for
COPYING, and use that macro in both the definition of pkgdata_DATA and
EXTRA_DIST?)

svn path=/trunk/; revision=37314
2011-05-19 21:11:44 +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
Gerald Combs 1fc831c211 More OS X installer fixes and tweaks.
svn path=/trunk/; revision=37107
2011-05-12 23:46:31 +00:00
Gerald Combs d94ab5c6ba Another attempt to fix the OS X .dmg builds.
svn path=/trunk/; revision=37106
2011-05-12 22:51:10 +00:00
Gerald Combs 763603d3b6 capinfos and editcap need PYTHON_DIR when we have Python enabled.
svn path=/trunk/; revision=36626
2011-04-13 16:05:11 +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
Gerald Combs d798a21643 Update the location of make-manuf.
svn path=/trunk/; revision=35133
2010-12-06 18:34:49 +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
Anders Broman fd44a8829a From Taras Kotov:
Add RADIUS dictionary for vendor Eltex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5415

svn path=/trunk/; revision=34943
2010-11-18 09:51:50 +00:00
Jeff Morriss d63f2559da Split libui into libui and libui_dirty. The latter contains (only)
text_import_scanner.c (which is generated and not by us so we can't guarantee
that it's clean).

svn path=/trunk/; revision=34912
2010-11-16 20:13:26 +00:00
Anders Broman 5bfb661d23 Add a wireshark file stock icon.
svn path=/trunk/; revision=34496
2010-10-13 11:15:11 +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
Gerald Combs 68d6299fc6 Remove the up/down arrow images. They haven't been used in a very long
time.

svn path=/trunk/; revision=33693
2010-08-03 00:08:14 +00:00
Guy Harris d7e9136268 Only link programs that call stuff in Application Services or Core
Foundation with those frameworks.

svn path=/trunk/; revision=33541
2010-07-15 19:43:01 +00:00
Guy Harris cc3540b0fb Move the code to get version information for libraries used by
libwireshark into libwireshark, and call it only in programs linked with
libwireshark.  That way, programs that don't link with libwireshark
don't have to link with libgcrypt or libgnutls solely so that they can
say that they're linked with a particular version of libgcrypt or
libgnutls.

Don't link dumpcap with libgcrypt or libgnutls any more.

svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
Gerald Combs bc9f8d0cd7 Add Visual C++ project files to the distribution.
svn path=/trunk/; revision=33386
2010-06-30 23:20:03 +00:00