diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-01-26 21:12:41 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-01-26 21:12:41 +0000 |
| commit | c6201489da328f9c7add98cce479bd4e69b864b0 (patch) | |
| tree | 92605ed5816face2da489e2655a21eda60c1cf29 /packaging/nsis | |
| parent | a165b0d6bec7d2186d6106f145d8b123ea93077f (diff) | |
updated NSIS generation to build GTK version 1 or 2,
added new target "packaging" to root Makefile.nmake,
which will generate version 1 or 2 or both,
depending on config.nmake GTK?_DIR setting
svn path=/trunk/; revision=9866
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 18 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 6 |
2 files changed, 18 insertions, 6 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index c71f21802c..d83ff0bda7 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.33 2004/01/05 21:47:44 ulfl Exp $ +# $Id: Makefile.nmake,v 1.34 2004/01/26 21:12:41 ulfl Exp $ # # NSIS is a free packager/installer/uninstaller program for Win32. # It was originally written for the Winamp package, but various @@ -48,14 +48,26 @@ PLUGINS=../../plugins/acn/acn.dll \ DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(HELP) $(PLUGINS) -ethereal-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake + + +!IFDEF GTK1 +DEST=ethereal +GTK_DIR=$(GTK1_DIR) +!ELSE +DEST=ethereal2 +GTK_DIR=$(GTK2_DIR) +!ENDIF + + +$(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake $(MAKENSIS) \ !IF "$(MAKENSIS_MODERN_UI)" != "" /DMAKENSIS_MODERN_UI=$(MAKENSIS_MODERN_UI) \ !ENDIF -!IF "$(GTK_VERSION)" == "2.0" +!IFDEF GTK2 /DGTK2 \ !ENDIF + /DDEST=$(DEST) \ /DGTK_DIR=$(GTK_DIR) \ /DGLIB_DIR=$(GLIB_DIR) \ /DICONV_DIR=$(ICONV_DIR) \ diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 7870e0c931..8d5d7e2cc0 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -1,7 +1,7 @@ ; ; ethereal.nsi ; -; $Id: ethereal.nsi,v 1.39 2004/01/05 15:27:35 ulfl Exp $ +; $Id: ethereal.nsi,v 1.40 2004/01/26 21:12:41 ulfl Exp $ ; ============================================================================ ; Header configuration @@ -10,7 +10,7 @@ Name "Ethereal" ; The file to write -OutFile "ethereal-setup-${VERSION}.exe" +OutFile "${DEST}-setup-${VERSION}.exe" ; Icon of installer and uninstaller Icon "..\..\image\ethereal.ico" @@ -168,7 +168,7 @@ SectionEnd Section "Ethereal" SecEthereal ;------------------------------------------- SetOutPath $INSTDIR -File "..\..\ethereal.exe" +File "..\..\${DEST}.exe" File "..\..\doc\ethereal.html" File "..\..\doc\ethereal-filter.html" !ifndef GTK2 |