diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-04-05 04:39:29 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-04-05 04:39:29 +0000 |
| commit | a8d864bca78bfaeb4a27649c16408064ed7f1068 (patch) | |
| tree | 17afe72068b50bb87e11e03c3a1e8bd543db4630 /packaging/nsis | |
| parent | c4979d817a4e6960a6a137857b467a10622d9fe0 (diff) | |
Use sed in the Win32 build to place the version in various files.
We us $(VERSION), defined in the top-level config.nmake, to replace
@VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are
similarly used.
svn path=/trunk/; revision=3258
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 7 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi.in (renamed from packaging/nsis/ethereal.nsi) | 13 |
2 files changed, 13 insertions, 7 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 252fb8dce4..c83e2990b6 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.2 2001/04/04 20:08:16 gram Exp $ +# $Id: Makefile.nmake,v 1.3 2001/04/05 04:39:27 gram Exp $ # # # NSIS is a free packager/installer/uninstaller program for Win32. @@ -25,5 +25,10 @@ PLUGINS=../../plugins/mgcp/mgcp.dll \ DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS) $(PDB) +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 diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi.in index 4f3bbe6d0a..f1f9bff0f3 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi.in @@ -1,7 +1,7 @@ ; ; ethereal.nsi ; -; $Id: ethereal.nsi,v 1.1 2001/04/04 04:50:05 gram Exp $ +; $Id: ethereal.nsi.in,v 1.1 2001/04/05 04:39:27 gram Exp $ ; ============================================================================ ; Header configuration @@ -58,7 +58,7 @@ ShowInstDetails show Section "-Required" ;------------------------------------------- SetOutPath $INSTDIR -File "..\..\wiretap\wiretap-0.0.dll" +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" @@ -98,7 +98,7 @@ File "..\..\doc\editcap.html" Section "Plugins" SectionIn 1,2 ;------------------------------------------- -SetOutPath $INSTDIR\plugins\0.8.16 +SetOutPath $INSTDIR\plugins\@VERSION@ File "..\..\plugins\gryphon\gryphon.dll" File "..\..\plugins\mgcp\mgcp.dll" @@ -128,12 +128,13 @@ Delete "$INSTDIR\README*" Delete "$INSTDIR\*.exe" Delete "$INSTDIR\*.pdb" Delete "$INSTDIR\*.html" -Delete "$INSTDIR\*.dll" -Delete "$INSTDIR\plugins\0.8.16\*.dll" +Delete "$INSTDIR\wiretap-@WTAP_VERSION@.dll" +Delete "$INSTDIR\plugins\@VERSION@\gryphon.dll" +Delete "$INSTDIR\plugins\@VERSION@\mgcp.dll" Delete "$SMPROGRAMS\Ethereal\*.*" RMDir "$SMPROGRAMS\Ethereal" -RMDir "$INSTDIR\plugins\0.8.16" +RMDir "$INSTDIR\plugins\@VERSION@" RMDir "$INSTDIR\plugins" RMDir "$INSTDIR" |