Commit Graph

268 Commits

Author SHA1 Message Date
Jaap Keuter 1d9162b3a2 Have the installer propose to install 4.0.1 over 4.0.0.
svn path=/trunk/; revision=22259
2007-07-06 20:34:20 +00:00
Gerald Combs 4155fb0433 Switch to WinPcap 4.0.1.
svn path=/trunk/; revision=22237
2007-07-04 00:53:03 +00:00
Martin Mathieson ffb54d975a Add DTD file for xcap-error (RFC 4825)
svn path=/trunk/; revision=22148
2007-06-21 11:37:42 +00:00
Ulf Lamping e6345ad54d Since the integration into the official GTK sources, the name of GTK-Wimp is now "GTK MS Windows Engine". Change the name in the NSIS installer and the docbook docs accordingly.
svn path=/trunk/; revision=22114
2007-06-16 11:09:34 +00:00
Martin Mathieson c474b96c17 Add gqpolicy.xml to installed diameter XML files
svn path=/trunk/; revision=22080
2007-06-12 15:29:23 +00:00
Gerald Combs a491fec183 From Mike Harvey: Support for WiMAX and the WiMAX M2M encapsulation protocol.
Add support for WiMAX and M2M to various makefiles and installer files.  Add
basic support for M2M to randpkt.

svn path=/trunk/; revision=21945
2007-05-25 23:40:42 +00:00
Jörg Mayer e14af5a577 Make sure we compare against something ("") in case
GTK_CONFIG is empty.

svn path=/trunk/; revision=21884
2007-05-22 13:16:36 +00:00
Ulf Lamping 0abc3ba979 instead of copying the MSVC 2005 manifest files around, embed them into the .exe / .dll files - this way is easier to handle while packaging and alike, and probably will solve some problems. We might want to do this for the plugins as well later.
svn path=/trunk/; revision=21696
2007-05-06 09:17:19 +00:00
Graeme Lunt 9efc4469dd New U3 packaging tool to generate a UUID based on the Wireshark version string within the Wireshark namespace. The Wireshark namespace UUID is:
94630be0-e031-11db-974d-0002a5d5c51b

It is based upon the example code from RFC4122 and links against gcrypt.

Using this tool allows the U3 packaging UUID to be automatically changed for new versions as well as giving each buildbot version a different UUID. 


svn path=/trunk/; revision=21694
2007-05-06 08:15:17 +00:00
Graham Bloice e3f4f4ecb0 Improved cleanup of build artifacts
svn path=/trunk/; revision=21249
2007-03-28 16:32:47 +00:00
Jeff Morriss 9fe056a3d7 Remove references to the megaco plugin from the Windows U3 packaging stuff (hopefully this is the last onegrep megaco *).
svn path=/trunk/; revision=21203
2007-03-26 06:04:17 +00:00
Jeff Morriss 6384a7a98b Remove references to the megaco plugin from the Windows packaging stuff.
svn path=/trunk/; revision=21202
2007-03-26 04:02:05 +00:00
Graeme Lunt ebf5874d29 Ensure that the correct U3 environment variables are set when the U3 Wireshark is started from a file association (e.g. opening a pcap file).
Also tweak the space requirements and restore the VERSION_EXTRA information to the description, both within the manifest.u3i.


svn path=/trunk/; revision=20964
2007-03-03 15:05:03 +00:00
Graeme Lunt 2449bf2db5 If the VERSION_EXTRA is set in config.nmake, this can lead to an invalid U3 package version in the manifest file.
So we now create the U3 package version from the base components.


svn path=/trunk/; revision=20957
2007-03-02 17:28:43 +00:00
Ulf Lamping 44b6dd623e prohibit installation on Win NT 4.0
svn path=/trunk/; revision=20906
2007-02-23 19:48:59 +00:00
Anders Broman bfb0a8f893 Copy the changes done for 0.99.5 to use WinPcap 4.0 to trunk.
svn path=/trunk/; revision=20820
2007-02-16 06:38:59 +00:00
Graeme Lunt fd3f0f3196 Remove version from Launchpad name and include a default dfilter_macros to remove start-up warning.
svn path=/trunk/; revision=20710
2007-02-04 12:35:31 +00:00
Ulf Lamping 276d768e5e quote HHC_DIR here too
svn path=/trunk/; revision=20704
2007-02-04 01:33:48 +00:00
Gerald Combs 320be55388 Add a Windows installer icon. Remove the ARGB versions from the other
Windows icons.

svn path=/trunk/; revision=20685
2007-02-02 18:45:23 +00:00
Ulf Lamping a267fc21e9 slightly better explain the user's guide "component"
svn path=/trunk/; revision=20648
2007-01-31 06:45:46 +00:00
Ulf Lamping 26b3f0b78d - add some links about U3
- fix some typos
- mention that uninstalling WS from the stick removes personal settings

svn path=/trunk/; revision=20643
2007-01-31 03:49:09 +00:00
Gerald Combs 3f00cb0e9b Switch to WinPcap 4.0.
svn path=/trunk/; revision=20622
2007-01-30 07:16:01 +00:00
Ulf Lamping eed4a86d99 if wireshark-gtk2.exe.manifest doesn't exist, don't try to copy it - hopefully fixes the buildbot...
svn path=/trunk/; revision=20618
2007-01-30 01:26:56 +00:00
Ulf Lamping 0137d412ac add some manifest files (on demand), otherwise u3 package won't work with MSVC!=6 (note that it still might need to provide msvcr*.dll files, I currently don't have a machine to test)
svn path=/trunk/; revision=20593
2007-01-28 23:36:13 +00:00
Graeme Lunt 197c6c9995 *) Ask the user if they want to install WinPcap.
*) Associate Wireshark with p7s, p7m and p7c files (if not already associated).


svn path=/trunk/; revision=20582
2007-01-28 10:10:06 +00:00
Graeme Lunt 1a9ea91193 Update manifest file (template) to:
a) remove schema reference
b) assign new GUID for 0.99.6

Update makefile.nmake to:
a) include user-guide.chm - user-guide.chm is copied from the nsis packaging directory
b) include the example_snmp_users_file
c) other tidy-ups


svn path=/trunk/; revision=20555
2007-01-25 17:37:54 +00:00
Ulf Lamping d85f759501 remove example_snmp_users_file at uninstall
svn path=/trunk/; revision=20530
2007-01-23 08:20:59 +00:00
Ulf Lamping 7fd3e76939 instead of getting the user-guide.chm file always from the docbook dir, copy the more recent one from docbook or win32-libs\user-guide dir into local nsis dir, and use that one to build the installer - seems to be the cleanest way
svn path=/trunk/; revision=20492
2007-01-19 00:10:22 +00:00
Graeme Lunt 4ea1d12df8 Update to get_persdatafile_dir() to choose a default directory on the U3 device that Wireshark is being run from.
The U3 Deployment Guide recommends a sub-directory of U3_DEVICE_DOCUMENT_PATH, so the u3util creates a "My Captures" sub-directory to use as the personal data file directory.


svn path=/trunk/; revision=20441
2007-01-15 19:11:29 +00:00
Graeme Lunt 2995e44354 Tidyups:
* clean up more things
* better directory creation
* README update


svn path=/trunk/; revision=20419
2007-01-13 17:01:43 +00:00
Ulf Lamping 19bd3956a2 fix some remaining MSVC != V6 issues:
- add redistributables (msvcr*.dll) to the NSIS installer (depending on MSVC_VARIANT)
- split MSVC2006 and MSVC2006EE (Express Edition) settings in config.nmake, as redistributable settings for NSIS are different
- remove Platform SDK setting from config.nmake, it's not needed

svn path=/trunk/; revision=20411
2007-01-13 00:59:39 +00:00
Luis Ontanon 9998032c59 Add the example_snmp_users_file to the ditribution
svn path=/trunk/; revision=20385
2007-01-10 21:48:22 +00:00
Ulf Lamping f6a83887d0 package manifest files only, if MSVC2005 / .NET SDK 2.0 is used - this should remove a warning while packaging the other variants
svn path=/trunk/; revision=20381
2007-01-10 21:37:52 +00:00
Gerald Combs a5a126a88d Fix the GNUTLS DLL names. Add the program version to the package file name.
svn path=/trunk/; revision=20380
2007-01-10 20:26:33 +00:00
Ulf Lamping ce7b1e5169 add wiretap manifest file to packaging
svn path=/trunk/; revision=20298
2007-01-03 23:12:37 +00:00
Ulf Lamping eaa4fa370a fix packaging (for now): copy the manifest files with the /nonfatal switch, so they only issue a warning if none existing (e.g. MSVC6).
This copying should be controlled by the MSVC_VARIANT setting in config.nmake instead (just like all the other alike settings).

svn path=/trunk/; revision=20286
2007-01-03 04:15:18 +00:00
Ulf Lamping 2d20cc40e2 from Laurent Rabret:
"Apply the ugly attached patch to the installer"

... it's not that ugly at all - and installs (deletes) the manifest files if available

svn path=/trunk/; revision=20285
2007-01-03 03:46:48 +00:00
Ulf Lamping 58532e4e8c delete GTK 2.10 files and dirs while uninstalling
svn path=/trunk/; revision=20284
2007-01-03 03:42:33 +00:00
Ulf Lamping 6be40f235a following the Microsoft installer guidelines: as default, an installer should not put an icon on the desktop
svn path=/trunk/; revision=20278
2007-01-02 23:55:47 +00:00
Ulf Lamping 77694f8b8e define SecMIBs only if NET_SNMP_DIR is defined - to prevent a NSIS warning
svn path=/trunk/; revision=20276
2007-01-02 22:19:48 +00:00
Gerald Combs b90006ac6f Update to GNUTLS 1.6.0.
svn path=/trunk/; revision=20204
2006-12-23 00:06:16 +00:00
Bill Meier e4a99fc4dd Add a few missing /$(MAKEFLAGS)
svn path=/trunk/; revision=20046
2006-12-05 12:36:06 +00:00
Graeme Lunt e5f1a984f1 U3 Packaging update for
a) Packaging changes - including the latest GTK/GLIB/PANGO libaries
b) File associations - made when Wireshark is first run and removed when device is removed.
c) Install WinPcap - by running the installer if WinPcap is not installed. Uninstalled (if the U3 device installed it) when the device is removed. (This is an interim approach until the appropriate WinPcap U3 installation can be determined).


svn path=/trunk/; revision=19985
2006-11-26 09:04:00 +00:00
Martin Mathieson b14829d151 From Olivier Jacques:
Here is a DTD for the MSCML protocol, draft-07. This implementation is not entirely up-to-date (draft-09 is out), but this is a good base to start from.
 
I updated the WIKI with info, snapshot and sample capture: http://wiki.wireshark.org/MSCML

svn path=/trunk/; revision=19901
2006-11-15 17:27:04 +00:00
Anders Broman 3b48829115 Add SIP application AVP:s.
svn path=/trunk/; revision=19890
2006-11-14 06:31:47 +00:00
Anders Broman 09bd61c233 Update to use the latest gtk 2.8 glib and pango libraries.
Note from a mail on gtk dev list:
-rwxr-xr-x    1 tml      Administ   224510 Oct  3 18:35 libpango-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    37952 Oct  3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    58749 Oct  3 18:35 libpangowin32-1.0-0.dll

(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)

svn path=/trunk/; revision=19880
2006-11-12 22:18:50 +00:00
Guy Harris faed34492b Get rid of another ACN reference.
svn path=/trunk/; revision=19843
2006-11-07 00:56:45 +00:00
Guy Harris 6481d6f8d4 Get rid of another ACN reference.
svn path=/trunk/; revision=19842
2006-11-07 00:56:04 +00:00
Anders Broman 6b45c9b92b Remove the references to acn
svn path=/trunk/; revision=19833
2006-11-06 20:36:43 +00:00
Graeme Lunt a213330a61 Update to U3 packaging to:
*) Assign a new UUID for version 0.99.5 (so different versions of Wireshark can be installed on one U3 device)
*) Include version number in U3 program name to allow user to differentiate versions
*) Catch up with packaging changes


svn path=/trunk/; revision=19790
2006-11-04 08:01:44 +00:00