diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-07-12 22:45:23 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-07-12 22:45:23 +0000 |
commit | 34e8119c3250228fdf6d0ffb5c432346bcf51bc5 (patch) | |
tree | e707e86058824fbeb1d57b7e2823c77bcc0b611a /packaging | |
parent | 9c0d2087dc4027e41dbe28249c3d0bbbfc27f30b (diff) | |
download | wireshark-34e8119c3250228fdf6d0ffb5c432346bcf51bc5.tar.gz |
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
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/nsis/Makefile.nmake | 5 | ||||
-rw-r--r-- | packaging/nsis/ethereal.nsi.in | 19 |
2 files changed, 20 insertions, 4 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index f82fcfe342..98eaa49ae8 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -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 diff --git a/packaging/nsis/ethereal.nsi.in b/packaging/nsis/ethereal.nsi.in index e95dc499dd..6bfed5025d 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.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 |