Commit graph

345 commits

Author SHA1 Message Date
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
Graeme Lunt
b6dc767069 Changes to use a generic manifest to determine package contents, and also U3 self-certification fixes e.g.
* package size (dependent on use of UPX)
* upgrade 
* shortDescription
* vendor


svn path=/trunk/; revision=24012
2008-01-04 14:10:57 +00:00
Graeme Lunt
906d66181e A script to generate a generic manifest file from the nsis/wireshark.nsi.
The U3 and portableapps packaging will use this generic manifest to package the 
correct set of components. Thus all three packages will be kept in sync.


svn path=/trunk/; revision=24011
2008-01-04 14:07:47 +00:00
Graeme Lunt
d8519d3c17 Automatically install the FindProcDll.dll NSIS plug-in required for the WiresharkPortable.exe.
This should allow the builbot to build the PortableApps packaging.


svn path=/trunk/; revision=23881
2007-12-16 08:36:16 +00:00
Graeme Lunt
a189f34b84 Fixes to:
a) Check that UPX is configured correctly and offer solutions;
b) Ignore any errors generated from UPX (e.g. from previously compressed files); and
c) Clean up the tools directory when cleaning the U3 distribtion


svn path=/trunk/; revision=23622
2007-11-27 18:07:00 +00:00
Ulf Lamping
07ad3cce07 don't install the *.exe.manifest and *.dll.manifest files. The manifest is embedded in the exe/dll files, so no need to install them seperately.
svn path=/trunk/; revision=23544
2007-11-22 09:04:32 +00:00
Martin Mathieson
d819c7fa95 Add missing \
svn path=/trunk/; revision=23495
2007-11-19 17:23:30 +00:00
Martin Mathieson
72fb7227fb Try to fix reported uninstallation problems
svn path=/trunk/; revision=23494
2007-11-19 16:29:41 +00:00
Graeme Lunt
04b798cbf4 Update to optionally use the "Ultimate Packer for eXecutables" (UPX) to pack the exes and dlls prior to U3 and PortableApps packaging.
For the U3 package, this results in a 40% smaller package.
For the PortableApps version, the package size is not much different, but the install time is quicker. 


svn path=/trunk/; revision=23484
2007-11-18 10:20:26 +00:00
Ulf Lamping
31f090e495 update various other places, where WinPcap version 4.0.1 was used
svn path=/trunk/; revision=23433
2007-11-12 07:34:32 +00:00
Ulf Lamping
634b43c3f9 update various other places, where WinPcap version 4.0.1 was used
svn path=/trunk/; revision=23431
2007-11-12 07:31:38 +00:00
Ulf Lamping
8cdc8e0d57 update WinPcap installer to recent 4.0.2
svn path=/trunk/; revision=23429
2007-11-11 20:36:41 +00:00
Anders Broman
405be3098f From Valery Sigalov:
New dissector for TPNCP protocol.
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1853

svn path=/trunk/; revision=23428
2007-11-11 13:23:17 +00:00
Gerald Combs
6e207e3f34 When checking to see if we should install WinPcap, check the installed
version directly instead of trying to divine it from its name. 

svn path=/trunk/; revision=23385
2007-11-06 20:32:30 +00:00
Graeme Lunt
2314eec9cb A bit of a readme for the Wireshark Portable packaging. Includes details of the NSIS plug-in required.
svn path=/trunk/; revision=23350
2007-11-03 20:27:48 +00:00