Commit graph

311 commits

Author SHA1 Message Date
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
Ulf Lamping
90935b972e at least mention in a comment, that you'll need the FindProcDLL plug-in
svn path=/trunk/; revision=23349
2007-11-03 08:48:12 +00:00
Graeme Lunt
cea89f8c12 Initial Portable Apps (www.portableapps.com) packaging to produce a "Wireshark Portable" (WSP) distribution.
This allows Wireshark to be run from any USB stick, unlike the U3 packaging which must be installed on a specific U3 device.

The packaging basically builds upon the U3 distribution so new libraries/config only need to be added to the U3 makefile to update both distributions.

It still takes a "dumb" approach to WinPcap - installing it if it is not already installed and removing it (if WSP installed it) when Wireshark quits. (This is worse than the U3 packaging which only uninstalls WinPcap when the device is removed.) Really must talk to the WinPcap guys to see how we can make this less intrusive.

I am talking to John Haller (the Portable Apps guy) about fine tuning the distribution. 


svn path=/trunk/; revision=23340
2007-11-02 13:47:23 +00:00
Bill Meier
8519153567 Small fixes:
1. wireshark.bat: Quote %U3_HOST_EXEC_PATH%\wireshark.exe so pathname
   with spaces will work;
2. makefile.nmake: Use $(MAKE) /$(MAKEFLAGS) so things like 
   invoking nmake at the top level with /E to have environment 
   variables override config.namke definitions will work.

svn path=/trunk/; revision=23297
2007-10-28 18:12:52 +00:00
Graeme Lunt
23ce3f94a2 U3 package update to:
a) include smi.dll if SMI_DIR is set
b) add a batch script to run the U3 wireshark configuration by simulating the U3 environment
c) include a test step in the build process to verify that the U3 package contains all the required files (tries to run "wireshark -D")
d) include the wireshark.bat in the U3 zip file.

This final step means that the U3 package can be unzipped on any drive and run using the wireshark.bat script. (Note this currently creates an unwanted cmd window.) 


svn path=/trunk/; revision=23295
2007-10-28 11:58:16 +00:00
Anders Broman
3c419f798c Make MGCP a builtin dissector to reduce the number of plugins.
(Leave the MGCP plugin dir for now).

svn path=/trunk/; revision=23190
2007-10-15 18:57:10 +00:00
Martin Mathieson
bafcd03634 In source tree, move wimaxasncp TLV files from plugin folder -> new top-level wimaxasncp folder.
svn path=/trunk/; revision=23184
2007-10-15 12:32:19 +00:00
Anders Broman
1ab1d61168 From Martin Mathieson:
Hopefully the u3 build will then be able to run to completion.

svn path=/trunk/; revision=23178
2007-10-14 22:05:52 +00:00
Anders Broman
e045016645 And U3 ...
svn path=/trunk/; revision=23176
2007-10-14 18:34:22 +00:00
Anders Broman
c644b82279 Ethercat plugin
Author :
Richard Kuemmel <r.kuemmel[AT]beckhoff.de>

Updates and bugfixes:
Peter Johansson <peterjohansson73[AT]gmail.com>

svn path=/trunk/; revision=23174
2007-10-14 15:45:24 +00:00
Martin Mathieson
2cc36d7876 Also add wimaxasncp TLV desription files to U3 build.
svn path=/trunk/; revision=23159
2007-10-12 11:13:59 +00:00
Martin Mathieson
5b6be0439d Install wimaxasncp TLV definition files (untested).
Q: are the plugins unconditionally installed by the win32 installer?  i.e. should the installation of these files be conditional?

svn path=/trunk/; revision=23157
2007-10-12 10:01:41 +00:00
Anders Broman
4330218b15 Try to fix the U3 build.
svn path=/trunk/; revision=22988
2007-09-26 19:00:48 +00:00
Anders Broman
6b4a7ba74d Use GTK+ 2.12
svn path=/trunk/; revision=22955
2007-09-25 16:09:58 +00:00
Jörg Mayer
094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Gerald Combs
7b6bc7a2b6 Enable NPF by default under Vista.
svn path=/trunk/; revision=22894
2007-09-17 18:40:34 +00:00
Martin Mathieson
c42aa86007 Crap - missed this one!
svn path=/trunk/; revision=22823
2007-09-07 15:24:43 +00:00
Luis Ontanon
15948507ae Get smi_modules in the distrib
svn path=/trunk/; revision=22694
2007-08-27 22:06:47 +00:00
Anders Broman
296a359e5a And now the MIB's
svn path=/trunk/; revision=22681
2007-08-27 06:40:36 +00:00
Anders Broman
b4246788a3 Add SMI to the installation, the MIB:s are still missing.
svn path=/trunk/; revision=22680
2007-08-27 06:28:20 +00:00
Gerald Combs
a6d76c62a5 Clear out any remaining references to the h223 plugin. Replace the
references to h223 in README.plugins with agentx since it's small and
no one seems to be in a hurry to move it to epan/dissectors. 

svn path=/trunk/; revision=22641
2007-08-24 16:08:31 +00:00
Guy Harris
da5a4dac33 Add the UNISTIM plugin, and put the plugins in alphabetical order (to
simplify checking whether we have the full list).

svn path=/trunk/; revision=22565
2007-08-21 18:04:09 +00:00
Guy Harris
4bf2ada77f Update the NSIS files to add the UNISTIM plugin.
svn path=/trunk/; revision=22563
2007-08-21 17:49:54 +00:00
Ulf Lamping
bd402b4d16 fix a typo
svn path=/trunk/; revision=22489
2007-08-12 23:38:09 +00:00
Ulf Lamping
0a4e09493a add IANA port-numbers file as a file named "services", with some minor explanations from me at the top of that file
add it to the distributed files, to the Win32 NSIS and U3 packages. UNIX packages will still miss this (optional) file.

svn path=/trunk/; revision=22487
2007-08-12 20:54:30 +00:00
Graeme Lunt
4ec27a3f42 Further synchronisation with wireshark.nsi
svn path=/trunk/; revision=22317
2007-07-15 10:59:07 +00:00
Graeme Lunt
bba7d780e9 Include latest configuration files and remove ones no longer shipped.
(Without these configuration files defragmentation was failing - unsure why!)


svn path=/trunk/; revision=22316
2007-07-15 10:26:55 +00:00
Martin Mathieson
16d51402d8 Add ETSI e2/e4 Diameter applications
svn path=/trunk/; revision=22283
2007-07-10 13:20:37 +00:00
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