osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Gerald Combs 2002-08-19 15:48:28 +00:00
parent c1c4eef87d
commit 6565c486b9
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packaging/nsis/Makefile.nmake
View File

@ -1,5 +1,5 @@
#
# $Id: Makefile.nmake,v 1.12 2002/07/12 22:52:38 guy Exp $
# $Id: Makefile.nmake,v 1.13 2002/08/19 15:48:28 gerald Exp $
#
# NSIS is a free packager/installer/uninstaller program for Win32.
# It was originally written for the Winamp package, but various
@ -30,15 +30,10 @@ PLUGINS=../../plugins/docsis/docsis.dll \
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS)
ethereal-setup-$(VERSION).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
$(MAKENSIS) /DVERSION=$(VERSION) /DWTAP_VERSION=$(WTAP_VERSION) /DCOMMON_FILES_GNU=$(COMMON_FILES_GNU) ethereal.nsi
clean:
rm -f ethereal.nsi ethereal-setup-$(VERSION).exe
rm -f ethereal-setup-$(VERSION).exe
$(DOC):
cd ../../doc

40
packaging/nsis/ethereal.nsi.in → packaging/nsis/ethereal.nsi
View File

@ -1,7 +1,7 @@
;
; ethereal.nsi
;
; $Id: ethereal.nsi.in,v 1.16 2002/07/12 22:52:38 guy Exp $
; $Id: ethereal.nsi,v 1.3 2002/08/19 15:48:28 gerald Exp $
; ============================================================================
; Header configuration
@ -10,7 +10,7 @@
Name "Ethereal"
; The file to write
OutFile "ethereal-setup-@VERSION@.exe"
OutFile "ethereal-setup-${VERSION}.exe"
; Icon of installer
Icon "..\..\image\ethereal.ico"
@ -52,18 +52,26 @@ InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\Ethereal "InstallDir"
ShowInstDetails show
; ============================================================================
; Installation execution commands
; ============================================================================
Section "-Required"
;-------------------------------------------
;
; Install for every user
;
SetShellVarContext all
SetOutPath $INSTDIR
File "..\..\wiretap\wiretap-@WTAP_VERSION@.dll"
File "c:\program files\common files\GNU\iconv-1.3.dll"
File "c:\program files\common files\GNU\glib-1.3.dll"
File "c:\program files\common files\GNU\gmodule-1.3.dll"
File "c:\program files\common files\GNU\gnu-intl.dll"
File "..\..\wiretap\wiretap-${WTAP_VERSION}.dll"
File "${COMMON_FILES_GNU}\iconv-1.3.dll"
File "${COMMON_FILES_GNU}\glib-1.3.dll"
File "${COMMON_FILES_GNU}\gmodule-1.3.dll"
File "${COMMON_FILES_GNU}\gnu-intl.dll"
;File "${COMMON_FILES_GNU}\zlib.dll"
File "..\..\README"
File "..\..\README.win32"
File "..\..\manuf"
@ -91,8 +99,8 @@ Section "Ethereal"
SetOutPath $INSTDIR
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"
File "${COMMON_FILES_GNU}\gtk-1.3.dll"
File "${COMMON_FILES_GNU}\gdk-1.3.dll"
SectionEnd
Section "Tethereal"
@ -126,7 +134,7 @@ SectionEnd
Section "Plugins"
;-------------------------------------------
SetOutPath $INSTDIR\plugins\@VERSION@
SetOutPath $INSTDIR\plugins\${VERSION}
File "..\..\plugins\docsis\docsis.dll"
File "..\..\plugins\giop\coseventcomm.dll"
File "..\..\plugins\giop\cosnaming.dll"
@ -166,16 +174,16 @@ Delete "$INSTDIR\sunping.xml"
Delete "$INSTDIR\*.exe"
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 "$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\*.*"
Delete "$DESKTOP\Ethereal.lnk"
RMDir "$SMPROGRAMS\Ethereal"
RMDir "$INSTDIR\plugins\@VERSION@"
RMDir "$INSTDIR\plugins\${VERSION}"
RMDir "$INSTDIR\plugins"
RMDir "$INSTDIR"