Commit Graph

359 Commits

Author SHA1 Message Date
Guy Harris 1f46ed6f11 COPYING is already put into the tarball; we don't need to add it here.
svn path=/trunk/; revision=25662
2008-07-02 08:50:11 +00:00
Guy Harris 6b1c9b4948 Push EXTRA_DIST entries into the lowest-level Makefile.am available.
svn path=/trunk/; revision=25661
2008-07-02 07:12:42 +00:00
Gerald Combs 72965329b0 Remove a lot of vestigal GTK-Wimp stuff. It's been included with
GTK+ since version 2.8, when its name was changed to the "GTK MS
Windows-Engine."

Simplify the Windows installer by removing the GTK-Wimp option (which
means the "Wireshark" item can be an entry instead of a group). Move
Rawshark to the "Tools" group.

(If anyone wants to disable the MS Windows Engine they can still do so
after installation by disabling or removing libwimp.dll.)

svn path=/trunk/; revision=25611
2008-06-26 16:42:07 +00:00
Stig Bjørlykke 9bd7d21dff Do not overwrite existing files when copying dependencies, as this will
overwrite the wireshark libs with libs installed in /opt/local, which is
probably not the ones we want.

svn path=/trunk/; revision=25483
2008-06-18 22:47:58 +00:00
Guy Harris ff8881072b We half-enabled the Mac OS X packaging stuff, which meant that we
weren't including in the tarball stuff the packaging/macosx/Makefile.in
file that that the configure script from the tarball was trying to
expand.  Add macosx to the list of directories in packaging/Makefile.am,
and update the comment in packaging/macosx/Makefile.am to reflect the
enabling of the OS X packaging stuff.

svn path=/trunk/; revision=25449
2008-06-13 16:52:45 +00:00
Guy Harris 5f16d4b797 The change to "Use GTK+ 2.12.10" switched from "libpng13.dll" to
"libpng12-0.dll"; fix a reference to the former.

svn path=/trunk/; revision=25440
2008-06-10 17:23:36 +00:00
Stig Bjørlykke d89cbcdda3 Set SYMROOT to make osx-package work correctly on my computers.
Hopefully this will not break the buildbot.

svn path=/trunk/; revision=25351
2008-05-22 10:34:32 +00:00
Stig Bjørlykke cf0f78ba4b Fetch version from correct variable, after changes done in r25232.
svn path=/trunk/; revision=25338
2008-05-21 12:35:05 +00:00
Jeff Morriss 58459d3fba Create a new "Wireshark utility" library and move the mpeg-audio stuff from
wiretap to this new libwsutil.  This solves
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark
no longer depend on libwiretap.

svn path=/trunk/; revision=25330
2008-05-20 21:51:01 +00:00
Tomas Kukosa b202c984e3 Update GnuTls to gnutls-2.3.8-1
svn path=/trunk/; revision=25309
2008-05-16 06:53:15 +00:00
Jaap Keuter cacee64927 From Hans-Peter Bock:
Attached to this post you find a patch for integration into wireshark that adds
a dissector for SERCOS III, ethertype 0x88cd.

svn path=/trunk/; revision=25270
2008-05-10 14:44:32 +00:00
Stig Bjørlykke 00f1fcf13c From Chris:
The attached simple patch adds 2 missing help files to HELP and
alphabetizes all of them.

svn path=/trunk/; revision=25067
2008-04-16 06:28:26 +00:00
Jörg Mayer a4dc607922 configure seems to install the manpages into .../share/man/, not .../man/
svn path=/trunk/; revision=25033
2008-04-15 01:26:02 +00:00
Jeff Morriss 41d7d06414 Remove the PSTAMP line (dated 2000-07-16). Instead let the package building tool automatically fill it in so that we can get some idea where/when a particular package was actually built.
svn path=/trunk/; revision=24882
2008-04-10 21:18:55 +00:00
Graeme Lunt ac38a5c7e2 Change of GTK variable name (GTK2_LIB_DIR => GTK_LIB_DIR)
svn path=/trunk/; revision=24865
2008-04-09 17:17:26 +00:00
Ulf Lamping 22045b4a54 lot's of GTK1 related code cleanup in the Win32 build process
svn path=/trunk/; revision=24854
2008-04-09 03:48:16 +00:00
Jeff Morriss 73d406c3f6 Make the SVR4 package checkinstall script work with only GTK2+.
svn path=/trunk/; revision=24853
2008-04-08 22:38:24 +00:00
Jeff Morriss c919e46511 Make the SVR4 package checkinstall script work with GTK1 or GTK2 (previously it only worked with GTK1). This version should go into the 1.0 trunk.
svn path=/trunk/; revision=24852
2008-04-08 22:03:42 +00:00
Ulf Lamping 9d06392749 fix u3 build
svn path=/trunk/; revision=24792
2008-04-05 15:15:14 +00:00
Ulf Lamping 5ffcbc7faa remove -gtk2 suffix
svn path=/trunk/; revision=24785
2008-04-05 08:23:37 +00:00
Ulf Lamping 73c84a7d7b remove more GTK1 stuff from the Win32 build process (incomplete)
svn path=/trunk/; revision=24780
2008-04-05 01:22:53 +00:00
Gerald Combs 12ac5d6859 Start the process of removing GTK1.
svn path=/trunk/; revision=24770
2008-04-04 18:18:18 +00:00
Jeff Morriss 0e941f397e The OS X packaging patch renamed the staging directory to .inst (instead of .stage). Update the SVR4 packaging script to reflect the new name.
svn path=/trunk/; revision=24769
2008-04-04 16:14:17 +00:00
Gerald Combs f25b110907 Remove most of the OS X packaging files from the distribution. The
files in Resources/themes/Clearlooks-Quicksilver-OSX overrun the
99-character file name length limitation imposed by the default tar
format (V7). We can fix this by

  - Feeding "tar-ustar" to AM_INIT_AUTOMAKE, which apparently means
    changing

AM_INIT_AUTOMAKE(wireshark, x.y.z)

    in configure.in to
  
AC_INIT(wireshark, x.y.z)
AM_INIT_AUTOMAKE(tar-ustar)

    Although the automake documentation recommends this, it means
    updating make-version.pl and possibly other scripts.

  - Shortening everything in the Clearlooks-Quicksilver-OSX path.

  - Skipping tar distributions altogether in favor of zip.

None of these fixes are trivial, and version 1.0 awaits. For now,
you'll have to build OS X packages from SVN.

svn path=/trunk/; revision=24752
2008-03-29 00:54:58 +00:00
Gerald Combs ebf0ed08a7 Trying to feed file names with spaces to GNU make will just end in tears.
Don't do that.

svn path=/trunk/; revision=24749
2008-03-28 21:11:53 +00:00
Gerald Combs 79c52c0950 Add the OS X packaging files to the distribution.
svn path=/trunk/; revision=24747
2008-03-28 18:49:49 +00:00
Gerald Combs 0859a2be01 Scale the 128-pixel icon down a little, so that it looks better in the dock.
Strip terminal control characters out of the build scripts, so that their
buildbot output is readable.

svn path=/trunk/; revision=24709
2008-03-21 16:09:04 +00:00
Gerald Combs d4ba88b677 Use libgmodule-2.0-0.dll 2.14.5 for the GTK+1 version of Wireshark.
svn path=/trunk/; revision=24703
2008-03-20 00:30:47 +00:00
Gerald Combs 664c9aa38a From Stig: Fix the call to osx-app.sh.
svn path=/trunk/; revision=24692
2008-03-19 00:02:24 +00:00
Gerald Combs 46bcad885a Check in the OS X packaging patch from bug 2341, since I've had
confirmation that the OS X package works on at least one system
other than my laptop.

svn path=/trunk/; revision=24640
2008-03-15 18:31:52 +00:00
Gerald Combs 7519d12f8f Make sure the Infiniband plugin is properly built and packaged.
svn path=/trunk/; revision=24634
2008-03-14 21:53:16 +00:00
Ulf Lamping d171cddc77 add an error message to the NSIS compiler output, if the MSVC_VARIANT setting is obviously wrong
svn path=/trunk/; revision=24439
2008-02-22 23:09:43 +00:00
Gerald Combs 396d5b4c4c Have the uninstaller remove ws.css.
svn path=/trunk/; revision=24437
2008-02-22 22:22:13 +00:00
Ulf Lamping d41b403367 add rawshark.html to packaging and Wireshark help menu
svn path=/trunk/; revision=24431
2008-02-22 20:38:50 +00:00
Gerald Combs 4f996bd670 Use the docbook CSS for the man pages (which assumes your version of
pod2html supports the "--css" flag). Package up the CSS file, and add
missing HTML files where needed.

svn path=/trunk/; revision=24428
2008-02-22 20:03:36 +00:00
Stig Bjørlykke bd24ad1cbe Added $(GTK2_LIB_DIR)\loaders to some makefiles in an attempt to fix the
u3 and portableapp build.

svn path=/trunk/; revision=24369
2008-02-17 10:37:21 +00:00
Bill Meier 5486e7db85 pcre.dll is now pcre3.dll for pcre-7.0
svn path=/trunk/; revision=24366
2008-02-16 21:24:52 +00:00
Anders Broman 363524d728 Use gtk+ 2.12.8 glib 2.12.6-2 and pcre 7.0.
( Problem seemed to be with pxbuffloaders).

svn path=/trunk/; revision=24357
2008-02-16 16:35:49 +00:00
Gerald Combs 98bacb3556 Add rawshark, a utility that, when given raw pcap-formatted packets and
a list of fields, prints the field values found in each packet.

Packet data can be specified as a libpcap DLT, e.g. "EN10MB" or an upper-layer protocol, e.g. "http".

svn path=/trunk/; revision=24339
2008-02-15 23:20:32 +00:00
Bill Meier 0d0d86cc57 (Use ifdef not IFDEF for consistency)
svn path=/trunk/; revision=24334
2008-02-15 03:12:52 +00:00
Bill Meier 395ec8f4a5 iconv is now not normally used;
svn path=/trunk/; revision=24333
2008-02-15 03:09:07 +00:00
Bill Meier 718b14c7ce Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
2008-02-14 17:16:12 +00:00
Anders Broman 8f3eeff54b Split out the Gmb application AVP:s to at least make it simpler to handle the
AVP "collision".
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1494

svn path=/trunk/; revision=24235
2008-01-31 21:52:47 +00:00
Stig Bjørlykke c785bbf558 Removed even more C++ style comments.
svn path=/trunk/; revision=24186
2008-01-24 22:33:49 +00:00
Gerald Combs 56ae79a3fd Unpack FindProcDLL.dll into $(WIRESHARK_LIBS\nsis-plugins, and tell NSIS
where it is using "!addplugindir".

svn path=/trunk/; revision=24166
2008-01-23 01:23:06 +00:00
Jeff Morriss 207afe82bb Associate Wireshark with Tektronix K12xx/K15 .rf5 files
svn path=/trunk/; revision=24067
2008-01-11 19:25:51 +00:00
Jörg Mayer c0dc930689 Graeme Lunt:
(The fix is to cd back to "../portableapps/win32", rather than
"../u3/win32", at the end of the nsis-bits target in makefile.nmake.)

Me:

Get rid of some whitespace at the end of lines.

svn path=/trunk/; revision=24031
2008-01-08 08:07:45 +00:00
Anders Broman 064496de3a Added missing Eriscsson.xml
svn path=/trunk/; revision=24027
2008-01-07 22:00:26 +00:00
Graeme Lunt 039ad15bbf UPX compression corrupts the WinPcap installer - so don't UPX it.
svn path=/trunk/; revision=24014
2008-01-04 15:28:44 +00:00
Graeme Lunt 105c394521 Update to use the generic manifest and make independent of the U3 packaging.
Also tidy up.


svn path=/trunk/; revision=24013
2008-01-04 14:12:22 +00:00