osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Gilbert Ramirez 2001-04-05 05:36:47 +00:00
parent a8d864bca7
commit a6b26c51bb
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packaging/nsis/Makefile.nmake
View File

@ -1,5 +1,5 @@
#
# $Id: Makefile.nmake,v 1.3 2001/04/05 04:39:27 gram Exp $
# $Id: Makefile.nmake,v 1.4 2001/04/05 05:36:47 gram Exp $
#
#
# NSIS is a free packager/installer/uninstaller program for Win32.
@ -25,10 +25,11 @@ PLUGINS=../../plugins/mgcp/mgcp.dll \
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS) $(PDB)
ethereal-setup.exe : ethereal.nsi $(DELIVERABLES)
$(MAKENSIS) ethereal.nsi
ethereal.nsi : ethereal.nsi.in
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@WTAP_VERSION@/$(WTAP_VERSION)/ \
< ethereal.nsi.in > ethereal.nsi
ethereal-setup.exe : ethereal.nsi $(DELIVERABLES)
$(MAKENSIS) ethereal.nsi

28
packaging/nsis/ethereal.nsi.in
View File

@ -1,7 +1,7 @@
;
; ethereal.nsi
;
; $Id: ethereal.nsi.in,v 1.1 2001/04/05 04:39:27 gram Exp $
; $Id: ethereal.nsi.in,v 1.2 2001/04/05 05:36:47 gram Exp $
; ============================================================================
; Header configuration
@ -28,9 +28,7 @@ LicenseData "GPL.txt"
; ============================================================================
; Component page configuration
; ============================================================================
ComponentText "Choose which components to install."
InstType Default
InstType Complete
ComponentText "The following components are available for installation."
; ============================================================================
; Directory selection page configuration
@ -73,7 +71,6 @@ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninst
Section "Ethereal"
;-------------------------------------------
SectionIn 1,2
SetOutPath $INSTDIR
File "..\..\ethereal.exe"
File "..\..\doc\ethereal.html"
@ -82,21 +79,18 @@ File "c:\program files\common files\GNU\gdk-1.3.dll"
Section "Tethereal"
;-------------------------------------------
SectionIn 1,2
SetOutPath $INSTDIR
File "..\..\tethereal.exe"
File "..\..\doc\tethereal.html"
Section "Editcap"
;-------------------------------------------
SectionIn 1,2
SetOutPath $INSTDIR
File "..\..\editcap.exe"
File "..\..\doc\editcap.html"
Section "Plugins"
SectionIn 1,2
;-------------------------------------------
SetOutPath $INSTDIR\plugins\@VERSION@
File "..\..\plugins\gryphon\gryphon.dll"
@ -104,20 +98,25 @@ File "..\..\plugins\mgcp\mgcp.dll"
Section "Debug PDB Files"
;-------------------------------------------
SectionIn 2
SetOutPath $INSTDIR
File "..\..\ethereal.pdb"
File "..\..\tethereal.pdb"
File "..\..\editcap.pdb"
SectionDivider
;-------------------------------------------
Section "Start Menu Shortcuts"
;-------------------------------------------
SectionIn 1,2
CreateDirectory "$SMPROGRAMS\Ethereal"
CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0
CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Documentation.lnk" "$INSTDIR\ethereal.html" "" "$INSTDIR\ethereal.html" 0
CreateShortCut "$SMPROGRAMS\Ethereal\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
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"
Section "Desktop Icon"
;-------------------------------------------
CreateShortCut "$DESKTOP\Ethereal.lnk" "$INSTDIR\Ethereal.exe"
Section "Uninstall"
;-------------------------------------------
@ -128,10 +127,11 @@ Delete "$INSTDIR\README*"
Delete "$INSTDIR\*.exe"
Delete "$INSTDIR\*.pdb"
Delete "$INSTDIR\*.html"
Delete "$INSTDIR\wiretap-@WTAP_VERSION@.dll"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\plugins\@VERSION@\gryphon.dll"
Delete "$INSTDIR\plugins\@VERSION@\mgcp.dll"
Delete "$SMPROGRAMS\Ethereal\*.*"
Delete "$DESKTOP\Ethereal.lnk"
RMDir "$SMPROGRAMS\Ethereal"
RMDir "$INSTDIR\plugins\@VERSION@"