Commit Graph

191 Commits

Author SHA1 Message Date
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 4bf2ada77f Update the NSIS files to add the UNISTIM plugin.
svn path=/trunk/; revision=22563
2007-08-21 17:49:54 +00:00
Gerald Combs 4155fb0433 Switch to WinPcap 4.0.1.
svn path=/trunk/; revision=22237
2007-07-04 00:53:03 +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
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
Ulf Lamping 276d768e5e quote HHC_DIR here too
svn path=/trunk/; revision=20704
2007-02-04 01:33:48 +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 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
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
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
Bill Meier e4a99fc4dd Add a few missing /$(MAKEFLAGS)
svn path=/trunk/; revision=20046
2006-12-05 12:36:06 +00:00
Guy Harris 6481d6f8d4 Get rid of another ACN reference.
svn path=/trunk/; revision=19842
2006-11-07 00:56:04 +00:00
Ulf Lamping 826b611290 fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO

svn path=/trunk/; revision=19715
2006-10-27 12:06:13 +00:00
Ulf Lamping fecd95b382 don't fail to create an installer if LUA_DIR or NET_SNMP_DIR are not defined (both optional)
svn path=/trunk/; revision=19642
2006-10-20 20:06:44 +00:00
Jaap Keuter a3f017648f From Shaun Jackman
The RDM protocol has been accepted as ANSI standard E1.20-2006. The following patch updates the decoder to that spec. 
At the same time it is promoted to a build-in dissector.

svn path=/trunk/; revision=19596
2006-10-18 19:29:05 +00:00
Gerald Combs e21c2fe5b5 Make the NSIS distclean target be a bit more thorough about cleaning up old
installers.

svn path=/trunk/; revision=19337
2006-09-27 16:49:53 +00:00
Luis Ontanon c8a95a0548 Lua 5.1.1 for windows
svn path=/trunk/; revision=19324
2006-09-26 03:31:00 +00:00
Ulf Lamping 85c1588650 remove the MAKENSIS_MODERN_UI, as the modern UI of NSIS is very stable now so there's no need for this setting any longer (removing some unnecessary complexity)
svn path=/trunk/; revision=19096
2006-08-30 23:25:15 +00:00
Gerald Combs 0213f60e4b Add GNUTLS to the Windows build.
In packet-ssl.c, move ssl_set_debug() up a bit so that we can debug key
file parsing.

svn path=/trunk/; revision=18850
2006-08-07 19:52:18 +00:00
Ronnie Sahlberg 84fd6a1f3d make nsis build aware of kerberos for windows if it is available
svn path=/trunk/; revision=18840
2006-08-05 05:12:09 +00:00
Jaap Keuter 1205ee2a14 From Christian Durrer:
I hope this is the right place to send a patch for a new dissector
plugin. The telegram it dissects are for the communication between PLCs
(Programmable logic controller) from the company Saia Burgess Controls
Ltd. (http://www.start-controls.com, http://www.saia-burgess.com or
http://www.sbc-support.ch). The protocol is named Ether-S-Bus (the PLCs
are called PCD2, PCD3, PCD4).

svn path=/trunk/; revision=18526
2006-06-21 06:31:06 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Gerald Combs 8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00
Gerald Combs b15974d094 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.

svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Gerald Combs ee4b9b7549 ethereal.nsi -> wireshark.nsi
svn path=/trunk/; revision=18254
2006-05-30 14:28:20 +00:00
Gerald Combs dedb24695e Transform ethereal.ico to wireshark.ico. Update references accordingly.
Change the name of the Windows package to "wireshark-setup-..."  Other
Ethereal -> Wireshark updates.

We _really_ need a better Wireshark icon.

svn path=/trunk/; revision=18253
2006-05-30 13:19:30 +00:00
Ulf Lamping dd44762c87 if HHC_DIR is defined in config.nmake, include the user-guide.chm file into the Win32 installer
svn path=/trunk/; revision=17936
2006-04-20 20:33:04 +00:00
Lars Roland 5f1e470cc2 changes to build lua plugin with MSVC6:
- nmake makefile for lua plugin added.
- declare variables at the beginning of a function.
- proto_reg_handoff_lua was removed, remove remaining calls, too.
- missing functions to libethereal.def added.

add lua plugin to installer, if available.

svn path=/trunk/; revision=17196
2006-02-07 09:12:43 +00:00
Gerald Combs 7463a0e9fb Fix themeing for GTK+ 2.8. This hasn't been tested under 2.6 or 2.4.
svn path=/trunk/; revision=16810
2005-12-15 19:12:51 +00:00
Gerald Combs 0616a4bedb Make sure we install the libpng and cairo DLLs if needed.
svn path=/trunk/; revision=16809
2005-12-15 03:36:17 +00:00
Gerald Combs 253b96e81f Add support for GLib/GTK+ 2.8. Point to the latest tag.
svn path=/trunk/; revision=16802
2005-12-14 21:19:39 +00:00
Anders Broman 54f93dda11 From Jaap Keuter:
Ethereal 0.10.13 and trunk have a glitch in the NSIS Makefile.nmake. It still works with WinPcap_3_1_beta4.exe. The attached patch resolves this.


svn path=/trunk/; revision=16299
2005-10-25 05:52:20 +00:00
Anders Broman 7d2f4603c1 Build the h223 plugin
svn path=/trunk/; revision=16140
2005-10-06 06:56:08 +00:00
Luis Ontanon ff03ea6ef2 the xml plugin was removed
svn path=/trunk/; revision=15734
2005-09-08 22:55:39 +00:00
Gerald Combs a64a4043c3 Revert back to GTK-Wimp 0.6.2. Move to WinPcap 3.1beta4.
svn path=/trunk/; revision=15091
2005-07-26 16:44:57 +00:00
Ulf Lamping dda9beb85c Installer:
- Installer now includes and installs WinPcap 3.0 (with detection)
- Install Sections are grouped now
- New Seperate page to select additional tasks like: icons, file extensions ...
- New Seperate page for WinPcap detection/installation
- Start WinPcap "NPF" service doesn't require a reboot

Uninstaller:
- New Uninstall sections page (uninstall, settings, plugins, WinPcap)
- If uninstallation selected, plugins will now be completely uninstalled (all versions, not only the current one)
- If selected, uninstallation of WinPcap

svn path=/trunk/; revision=15016
2005-07-23 20:34:43 +00:00
Anders Broman 37915b4dd7 Add parlay.dll and tango.dll to the installer.
svn path=/trunk/; revision=14870
2005-07-07 19:48:06 +00:00
Lars Roland e695d5c1fc add xml and stats_tree plugin to the installer.
svn path=/trunk/; revision=13657
2005-03-07 22:31:13 +00:00
Guy Harris 6616a3770c Make the "maintainer-clean" rules get rid of some additional generated
files.  Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and
GENERATED_FILES macros in Makefile.common files, along the lines of what
wiretap/Makefile.common has.

Clean up "*~" files with "make clean" rather than only "make distclean"
in some additional places.

Add "maintainer-clean" rules to the Makefile.nmake files, paralelling
the ones in the automake-generated Makefile.in files, using the
GENERATED_FILES macros from Makefile.common files.  In some cases, move
the cleanup of files from "make distclean" to "make maintainer-clean",
and in other cases, put in a comment indicating why we're not doing that
(because some files that are distributed in the source tarballs, namely
Flex output, were built with a UN*X Flex and won't compile on Windows,
so we get rid of them with "make distclean" so you can clean up stuff
that *has* to be re-generated for Windows).

Clean up some *CLEANFILES definitions - get rid of ones that no longer
apply as files were moved or that add to the definition a name that's
already there.

svn path=/trunk/; revision=13402
2005-02-14 20:33:57 +00:00
Guy Harris ba7e8f3b81 From Oleg Terletsky: AgentX support.
svn path=/trunk/; revision=13372
2005-02-10 06:36:21 +00:00
Lars Roland c4ac7edd32 Add mate.dll to the installer.
However it won't be installed by default.

svn path=/trunk/; revision=13155
2005-01-21 19:16:05 +00:00
Ulf Lamping 0f80fa5c7d renamed capinfo to capinfos, as the former name capinfo was already used in a program called tcprelay, so that might confuse packaging managers and users. Hopefully I got all the places need to be changed.
svn path=/trunk/; revision=12358
2004-10-20 18:50:58 +00:00
Olivier Biot 4878b7488b First support for Unix-to-DOS line termination translation by means of a small
perl script (unix2dos.pl). The NEWS file is now properly displayed on the
Notepad.exe text editor on a Windows box.

svn path=/trunk/; revision=12318
2004-10-16 11:46:17 +00:00
Ulf Lamping 365119bdd0 removed well_known.txt
svn path=/trunk/; revision=12111
2004-09-27 17:27:27 +00:00
Guy Harris 6e9e773a85 From Lars Roland:
don't support GTK-Wimp for GTK+ 1.2[.x] (it requires 2.x);

	install the NEWS file as "NEWS.txt";

	optionally show it at the end of an installation.

svn path=/trunk/; revision=11841
2004-08-26 22:48:29 +00:00
Olivier Biot 1867a5e9a5 Add capinfo to the Windows installer.
svn path=/trunk/; revision=11558
2004-07-28 23:09:12 +00:00
Guy Harris 6041d12dde From Laurent Rabret: OPSI support.
svn path=/trunk/; revision=11454
2004-07-21 06:31:33 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Guy Harris 01c249fd4f From Lars Roland: define an "installation" version of GTK+ 2.x and Pango
in "config.nmake", and use that in the NSIS script when generating the
NSIS installer, so it puts GTK+ and Pango in the appropriate
subdirectories.  Also, when uninstalling, remove both of the sets of
subdirectories.

As per his suggestion, get rid of the "GTK1_VERSION" and "GTK2_VERSION"
macros, and just directly insert the values where those macros were used
- "GTK1_VERSION" wasn't used at all, and "GTK2_VERSION" was only used
immediately below where it was defined, and stuff elsewhere, such as in
the NSIS script, didn't use them and would break if you changed them
anyway.

svn path=/trunk/; revision=10976
2004-05-23 22:21:30 +00:00
Olivier Biot d5a08cdf9f Fix a typo (seperate should be separate).
svn path=/trunk/; revision=10878
2004-05-13 20:54:39 +00:00
Guy Harris 15af0f656f From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
	libethereal.dll or not;

	remove "./wiretap" from PATH to prevent problems due to
	wrongly-loaded files;

	build dissector.lib with MSVC;

	move "print.c" and "ps.c" to the dissector helpers, as "print.c"
	imports variables from packet-frame.c and packet-data.c, which
	are in libethereal;

	move "g711.c" out of the dissector helpers, as they're used only
	by Ethereal in a tap, not in Tethereal or in any dissector;

	add a .def file for libethereal;

	arrange to declare global variables exported from libethereal
	with "__declspec(dllimport)" when building programs that import
	those variables;

	update the NSIS installer.

Make the "configure" script define ETH_VAR_IMPORT as "extern".

svn path=/trunk/; revision=10834
2004-05-09 10:03:41 +00:00
Guy Harris a1467c86e1 From Duncan Sargeant: Cisco SS7 RUDP, RLM, and Session Management
support.

svn path=/trunk/; revision=10480
2004-03-25 11:21:07 +00:00
Ulf Lamping 301b5ddbcc added gtk-wimp to the nsis installer build
svn path=/trunk/; revision=10227
2004-02-24 18:51:40 +00:00
Gerald Combs 037c2c12e4 From Lars Roland: Add support for a combined GTK1/2 Windows installer.
svn path=/trunk/; revision=10098
2004-02-18 20:45:54 +00:00
Ulf Lamping 610ff1ee37 renamed GTK2 version from ethereal2.exe to ethereal-gtk2.exe,
as this is *not* the Ethereal version 2 already.
Some other cleanup done

svn path=/trunk/; revision=9998
2004-02-06 18:47:45 +00:00
Ulf Lamping 97172d52a0 from Lars Roland: fix NSIS uninstallation
svn path=/trunk/; revision=9971
2004-02-03 20:03:40 +00:00
Ulf Lamping c6201489da updated NSIS generation to build GTK version 1 or 2,
added new target "packaging" to root Makefile.nmake,
which will generate version 1 or 2 or both,
depending on config.nmake GTK?_DIR setting

svn path=/trunk/; revision=9866
2004-01-26 21:12:41 +00:00
Ulf Lamping a895b5a77b fixed / updated some dependencies
svn path=/trunk/; revision=9563
2004-01-05 21:47:44 +00:00
Ulf Lamping f849df17e6 conditionally use modern UI for NSIS installer
svn path=/trunk/; revision=9448
2003-12-26 12:27:47 +00:00
Ulf Lamping f86e376f5b get rid of the COMMON_FILES_GNU setting,
by getting the DLL's from the "source tree"

svn path=/trunk/; revision=9415
2003-12-22 21:41:40 +00:00
Guy Harris b8299f0b98 From Jan Kiszka: IrDA support.
svn path=/trunk/; revision=9345
2003-12-18 19:07:14 +00:00
Guy Harris 2df96b563e From Christoph Neusch: V5UA support.
From Anders Broman: patches to various makefiles and configure scripts
to build the V5UA dissector, and patches to make it compile.

From me: .cvsignore file, and NSIS patches.

svn path=/trunk/; revision=9311
2003-12-17 05:16:21 +00:00
Guy Harris b87e74ed6b From Lars Roland: get rid of NSIS support for glib 1.3, as we don't
support that any more.

svn path=/trunk/; revision=9288
2003-12-15 04:28:57 +00:00
Guy Harris 2207d57087 From Lars Roland: fix the NSIS Makefile to handle PCRE.
svn path=/trunk/; revision=9205
2003-12-08 20:42:53 +00:00
Guy Harris 33629cc801 From Erwin Rol: initial ENTTEC support and RDM support.
svn path=/trunk/; revision=8985
2003-11-17 20:57:14 +00:00
Guy Harris c68a7d7cb1 From Matthias Melchior: plugin to decode BER-encoded ASN.1 messages,
given a type-table from "snacc" as a protocol description.

svn path=/trunk/; revision=8799
2003-10-28 07:02:38 +00:00
Guy Harris c3c558a6c3 From Lars Roland: fix a typo.
svn path=/trunk/; revision=8790
2003-10-27 22:29:52 +00:00
Guy Harris 4fa26855a4 From Erwin Rol: ACN support.
svn path=/trunk/; revision=8686
2003-10-14 01:18:11 +00:00
Guy Harris 02e1d2680a Give every Makefile.nmake file a "distclean" rule, and have "distclean"
recurse into subdirectories doing "nmake -f Makefile.nmake distclean".

Have "nmake -f Makefile.nmake clean" not remove stuff that "make clean"
doesn't remove (such as Flex/Bison output and config.h files) - and have
"nmake -f Makefile.nmake distclean" remove stuff that "make distclean"
removes, including "tethereal-tap-register.c" and
"ethereal-tap-register.c".

svn path=/trunk/; revision=8672
2003-10-10 21:31:53 +00:00
Gerald Combs d99b8a3abc Fix document creation under Windows, add ethereal-filter.html to the NSIS
package.

svn path=/trunk/; revision=8596
2003-10-02 22:28:04 +00:00
Guy Harris ff9a155db3 LWRES support, from Oleg Terletsky.
svn path=/trunk/; revision=8133
2003-08-05 05:09:37 +00:00
Gerald Combs d6ed142549 From Lars Roland: Updates to support linking against Glib 2.2 plus GTK+ 1.3
on Windows.

svn path=/trunk/; revision=8066
2003-07-22 22:00:38 +00:00
Guy Harris f54e01516a From Erwin Rol: RTNET/TDMA support.
svn path=/trunk/; revision=7839
2003-06-11 09:17:03 +00:00
Guy Harris bbb746f9b1 From Erwin Rol: ArtNET support.
svn path=/trunk/; revision=7518
2003-04-21 21:28:39 +00:00
Guy Harris 28af7d2f8f From Stephen Shelley: in the NSIS installer build, use the NET_SNMP_DIR
definition in config.nmake, rather than force the builder to update the
NSIS config file by hand.

svn path=/trunk/; revision=7488
2003-04-18 04:46:38 +00:00
Guy Harris effa1b3a7c Add the MEGACO and PCLI plugins.
svn path=/trunk/; revision=7024
2003-01-28 22:18:06 +00:00
Jörg Mayer 15c6107d19 Add the FAQ to the packages.
svn path=/trunk/; revision=6028
2002-08-20 00:59:42 +00:00
Gerald Combs 6565c486b9 From Ulf Lamping:
Generalize paths and get rid of sed-dependent ethereal.nsi.in.

Remove ethereal.nsi.in, and re-add ethereal.nsi with Ulf's changes.
Modify Makefile.nmake to use it.

Note:  You'll have to add "COMMON_FILES_GNU" path to your config.nmake
that points to a directory with all of Ethereal's required DLLs.

Be obnixious and set "SetShellVarContext all" so that we install for
every user, like most standard Windows apps.

svn path=/trunk/; revision=6020
2002-08-19 15:48:28 +00:00
Guy Harris 8a9b35cb5e From Anand V. Narwani:
DOCSIS support, including support for "Ethernet" captures where
	    the raw frame is a DOCSIS frame rather than an Ethernet
	    frame (some Cisco cable-modem head-end gear can send out a
	    trace of all traffic on an Ethernet, but what it sends are
	    the raw bytes of DOCSIS frames, not Ethernet frames)

Get rid of second AUTHORS entry for Devin Heitmueller, merging its item
into the older entry.

Clean up the order of some lists of plugin items.

svn path=/trunk/; revision=5861
2002-07-12 22:52:43 +00:00
Gilbert Ramirez fbc43449fb Produce ethereal-setup-$VERSION.exe instead of ethereal-setup.exe.
From Andrew C. Feren <aferen@cetacean.com>

svn path=/trunk/; revision=4993
2002-03-20 19:45:51 +00:00
Guy Harris cb489a92bb From Hamish Moffatt:
Additional Windows Makefile dependencies, so more stuff gets
	built as needed.

	Additional stuff cleaned up by "make clean" (well, "nmake -f
	makefile.nmake clean", anyway)

	Make PDB_FILE be "vc*.pdb", so it referes to the PDB files
	either for VC++ 5.0 or VC++ 6.0.

svn path=/trunk/; revision=4481
2002-01-04 21:20:20 +00:00
Guy Harris 1e8ca8af4d From Motonori Shindo: don't put the PDB files into the release, as
they're not built and the executables already contain debugging
information, and update the README.win32 file appropriately and add
Text2Pcap and Mergecap to it.

svn path=/trunk/; revision=4425
2001-12-19 19:16:12 +00:00
Guy Harris 39362af814 From Motonori Shindo:
fix a bogus batch mode inference rule of make, so that
	"vc60.pdb" files are created in the proper directory;

	delete ".pdb" files in a "nmake -f Makefile.nmake clean";

	include the text2pcap and mergecap ".pdb" files in the Windows
	binary distribution.

svn path=/trunk/; revision=4385
2001-12-12 01:29:13 +00:00
Gilbert Ramirez 34e8119c32 Package mergecap.exe and its HTML documentation.
Update NSIS syntax for newest NSIS. That fix from David O'Shea.
Set config.nmake to get non-cygwin version of Python.exe; cygwin version
is fouling up on me and I'm not sure why.

svn path=/trunk/; revision=3705
2001-07-12 22:45:23 +00:00
Gilbert Ramirez ec962d8cbd Win32: build text2pcap doco and package it.
svn path=/trunk/; revision=3435
2001-05-22 16:19:45 +00:00
Gilbert Ramirez b6bd7af57a Improvement of 'make clean' targets.
svn path=/trunk/; revision=3297
2001-04-12 18:07:22 +00:00
Gilbert Ramirez a6b26c51bb Remove the 3 types of installation in favor of a "type-less"
installation. Now the user just gets to select components to install.
Provide for installing a Deskstop Icon, too.

svn path=/trunk/; revision=3259
2001-04-05 05:36:47 +00:00
Gilbert Ramirez a8d864bca7 Use sed in the Win32 build to place the version in various files.
We us $(VERSION), defined in the top-level config.nmake, to replace
@VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are
similarly used.

svn path=/trunk/; revision=3258
2001-04-05 04:39:29 +00:00
Gilbert Ramirez fa924d4380 Move the comments in nsis/README into nsis/Makefile.nmake
Have automake package the nsis files into the source tarball.

svn path=/trunk/; revision=3256
2001-04-04 20:08:16 +00:00
Gilbert Ramirez e03cc2278c Packaging files for Win32, using NSIS, the NullSoft Installer, that
was originally written for WinAmp. See http://www.nullsoft.com/free/nsis/

svn path=/trunk/; revision=3255
2001-04-04 04:50:05 +00:00