diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-07-12 22:52:43 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-07-12 22:52:43 +0000 |
| commit | 8a9b35cb5e016f8e5936d0dd48d9edc6fb64d57a (patch) | |
| tree | eadbf839094b44e673f74473d5ba252222011f2e /packaging | |
| parent | 8f7a0ba2e1353235de78266c82789187b488d3d1 (diff) | |
| download | wireshark-8a9b35cb5e016f8e5936d0dd48d9edc6fb64d57a.tar.gz wireshark-8a9b35cb5e016f8e5936d0dd48d9edc6fb64d57a.tar.bz2 wireshark-8a9b35cb5e016f8e5936d0dd48d9edc6fb64d57a.zip | |
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
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 10 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi.in | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index d851b0cbd4..3d6852ad6e 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -1,6 +1,5 @@ # -# $Id: Makefile.nmake,v 1.11 2002/03/20 19:45:51 gram Exp $ -# +# $Id: Makefile.nmake,v 1.12 2002/07/12 22:52:38 guy Exp $ # # NSIS is a free packager/installer/uninstaller program for Win32. # It was originally written for the Winamp package, but various @@ -22,8 +21,11 @@ DOC=../../doc/ethereal.html \ ../../README.win32 GPL=GPL.txt -PLUGINS=../../plugins/mgcp/mgcp.dll \ - ../../plugins/gryphon/gryphon.dll +PLUGINS=../../plugins/docsis/docsis.dll \ + ../../plugins/giop/coseventcomm.dll \ + ../../plugins/giop/cosnaming.dll \ + ../../plugins/gryphon/gryphon.dll \ + ../../plugins/mgcp/mgcp.dll DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS) diff --git a/packaging/nsis/ethereal.nsi.in b/packaging/nsis/ethereal.nsi.in index 23023f1886..bc29e9f243 100644 --- a/packaging/nsis/ethereal.nsi.in +++ b/packaging/nsis/ethereal.nsi.in @@ -1,7 +1,7 @@ ; ; ethereal.nsi ; -; $Id: ethereal.nsi.in,v 1.15 2002/06/01 22:17:22 guy Exp $ +; $Id: ethereal.nsi.in,v 1.16 2002/07/12 22:52:38 guy Exp $ ; ============================================================================ ; Header configuration @@ -127,10 +127,11 @@ SectionEnd Section "Plugins" ;------------------------------------------- SetOutPath $INSTDIR\plugins\@VERSION@ +File "..\..\plugins\docsis\docsis.dll" +File "..\..\plugins\giop\coseventcomm.dll" +File "..\..\plugins\giop\cosnaming.dll" File "..\..\plugins\gryphon\gryphon.dll" File "..\..\plugins\mgcp\mgcp.dll" -File "..\..\plugins\giop\cosnaming.dll" -File "..\..\plugins\giop\coseventcomm.dll" SectionEnd SectionDivider @@ -167,6 +168,7 @@ Delete "$INSTDIR\*.html" Delete "$INSTDIR\*.dll" Delete "$INSTDIR\plugins\@VERSION@\coseventcomm.dll" Delete "$INSTDIR\plugins\@VERSION@\cosnaming.dll" +Delete "$INSTDIR\plugins\@VERSION@\docsis.dll" Delete "$INSTDIR\plugins\@VERSION@\gryphon.dll" Delete "$INSTDIR\plugins\@VERSION@\mgcp.dll" Delete "$SMPROGRAMS\Ethereal\*.*" |