forked from osmocom/wireshark
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
This commit is contained in:
parent
9c0d2087dc
commit
34e8119c32
|
@ -1,4 +1,4 @@
|
|||
# $Id: config.nmake,v 1.14 2001/05/16 16:17:50 jfoster Exp $
|
||||
# $Id: config.nmake,v 1.15 2001/07/12 22:45:21 gram Exp $
|
||||
|
||||
VERSION=0.8.18
|
||||
RC_VERSION=0,8,18
|
||||
|
@ -20,7 +20,7 @@ LOCAL_LDFLAGS=/DEBUG
|
|||
|
||||
PERL=perl
|
||||
POD2MAN=perl /usr/bin/pod2man
|
||||
PYTHON=python
|
||||
PYTHON="C:/python21/python.exe"
|
||||
LEX=flex
|
||||
YACC=bison
|
||||
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
#
|
||||
# $Id: Makefile.nmake,v 1.3 2001/05/22 16:19:44 gram Exp $
|
||||
# $Id: Makefile.nmake,v 1.4 2001/07/12 22:45:22 gram Exp $
|
||||
|
||||
include ../config.nmake
|
||||
|
||||
doc: ethereal.html tethereal.html editcap.html text2pcap.html
|
||||
doc: ethereal.html tethereal.html editcap.html text2pcap.html \
|
||||
mergecap.html
|
||||
|
||||
ethereal.html : ethereal.1
|
||||
man2html ethereal.1 > $@
|
||||
|
@ -14,6 +15,9 @@ tethereal.html : tethereal.1
|
|||
editcap.html : editcap.1
|
||||
man2html editcap.1 > $@
|
||||
|
||||
mergecap.html : mergecap.1
|
||||
man2html mergecap.1 > $@
|
||||
|
||||
text2pcap.html : text2pcap.1
|
||||
man2html text2pcap.1 > $@
|
||||
|
||||
|
@ -41,6 +45,12 @@ editcap.1: editcap.pod ../config.h
|
|||
--release=$(VERSION) \
|
||||
> editcap.1
|
||||
|
||||
mergecap.1: mergecap.pod ../config.h
|
||||
$(POD2MAN) mergecap.pod \
|
||||
--center="The Ethereal Network Analyzer" \
|
||||
--release=$(VERSION) \
|
||||
> mergecap.1
|
||||
|
||||
text2pcap.1: text2pcap.pod ../config.h
|
||||
$(POD2MAN) text2pcap.pod \
|
||||
--center="The Ethereal Network Analyzer" \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile.nmake,v 1.6 2001/05/22 16:19:45 gram Exp $
|
||||
# $Id: Makefile.nmake,v 1.7 2001/07/12 22:45:23 gram Exp $
|
||||
#
|
||||
#
|
||||
# NSIS is a free packager/installer/uninstaller program for Win32.
|
||||
|
@ -11,13 +11,14 @@
|
|||
include ../../config.nmake
|
||||
|
||||
EXE=../../ethereal.exe ../../tethereal.exe ../../editcap.exe \
|
||||
../../text2pcap.exe
|
||||
../../text2pcap.exe ../../mergecap.exe
|
||||
PDB=../../ethereal.pdb ../../tethereal.pdb ../../editcap.pdb
|
||||
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll
|
||||
DOC=../../doc/ethereal.html \
|
||||
../../doc/tethereal.html \
|
||||
../../doc/editcap.html \
|
||||
../../doc/text2pcap.html \
|
||||
../../doc/mergecap.html \
|
||||
../../README \
|
||||
../../README.win32
|
||||
GPL=GPL.txt
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;
|
||||
; ethereal.nsi
|
||||
;
|
||||
; $Id: ethereal.nsi.in,v 1.3 2001/05/22 16:19:45 gram Exp $
|
||||
; $Id: ethereal.nsi.in,v 1.4 2001/07/12 22:45:23 gram Exp $
|
||||
|
||||
; ============================================================================
|
||||
; Header configuration
|
||||
|
@ -67,7 +67,7 @@ File "..\..\README.win32"
|
|||
; Write the uninstall keys for Windows
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "DisplayName" "Ethereal"
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "UninstallString" '"$INSTDIR\uninstall.exe"'
|
||||
|
||||
SectionEnd
|
||||
|
||||
Section "Ethereal"
|
||||
;-------------------------------------------
|
||||
|
@ -76,25 +76,35 @@ File "..\..\ethereal.exe"
|
|||
File "..\..\doc\ethereal.html"
|
||||
File "c:\program files\common files\GNU\gtk-1.3.dll"
|
||||
File "c:\program files\common files\GNU\gdk-1.3.dll"
|
||||
SectionEnd
|
||||
|
||||
Section "Tethereal"
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR
|
||||
File "..\..\tethereal.exe"
|
||||
File "..\..\doc\tethereal.html"
|
||||
SectionEnd
|
||||
|
||||
Section "Editcap"
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR
|
||||
File "..\..\editcap.exe"
|
||||
File "..\..\doc\editcap.html"
|
||||
SectionEnd
|
||||
|
||||
Section "Text2Pcap"
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR
|
||||
File "..\..\text2pcap.exe"
|
||||
File "..\..\doc\text2pcap.html"
|
||||
SectionEnd
|
||||
|
||||
Section "Mergecap"
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR
|
||||
File "..\..\mergecap.exe"
|
||||
File "..\..\doc\mergecap.html"
|
||||
SectionEnd
|
||||
|
||||
|
||||
Section "Plugins"
|
||||
|
@ -102,6 +112,7 @@ Section "Plugins"
|
|||
SetOutPath $INSTDIR\plugins\@VERSION@
|
||||
File "..\..\plugins\gryphon\gryphon.dll"
|
||||
File "..\..\plugins\mgcp\mgcp.dll"
|
||||
SectionEnd
|
||||
|
||||
Section "Debug PDB Files"
|
||||
;-------------------------------------------
|
||||
|
@ -109,6 +120,7 @@ SetOutPath $INSTDIR
|
|||
File "..\..\ethereal.pdb"
|
||||
File "..\..\tethereal.pdb"
|
||||
File "..\..\editcap.pdb"
|
||||
SectionEnd
|
||||
|
||||
SectionDivider
|
||||
;-------------------------------------------
|
||||
|
@ -120,10 +132,12 @@ CreateDirectory "$SMPROGRAMS\Ethereal"
|
|||
CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal.lnk" "$INSTDIR\ethereal.exe"
|
||||
CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Documentation.lnk" "$INSTDIR\ethereal.html"
|
||||
CreateShortCut "$SMPROGRAMS\Ethereal\Uninstall.lnk" "$INSTDIR\uninstall.exe"
|
||||
SectionEnd
|
||||
|
||||
Section "Desktop Icon"
|
||||
;-------------------------------------------
|
||||
CreateShortCut "$DESKTOP\Ethereal.lnk" "$INSTDIR\Ethereal.exe"
|
||||
SectionEnd
|
||||
|
||||
Section "Uninstall"
|
||||
;-------------------------------------------
|
||||
|
@ -144,4 +158,5 @@ RMDir "$SMPROGRAMS\Ethereal"
|
|||
RMDir "$INSTDIR\plugins\@VERSION@"
|
||||
RMDir "$INSTDIR\plugins"
|
||||
RMDir "$INSTDIR"
|
||||
SectionEnd
|
||||
|
||||
|
|
Loading…
Reference in New Issue