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

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
This commit is contained in:
Ulf Lamping 2004-01-26 21:12:41 +00:00
parent a165b0d6be
commit c6201489da
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.397 2004/01/24 20:01:35 ulfl Exp $
# $Id: Makefile.nmake,v 1.398 2004/01/26 21:12:40 ulfl Exp $
include config.nmake
include <win32.mak>
@ -169,6 +169,18 @@ RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergeca
all: tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc
packaging: all
cd packaging
cd nsis
!IFDEF GTK1_DIR
nmake -f makefile.nmake GTK1="USE"
!ENDIF
!IFDEF GTK2_DIR
nmake -f makefile.nmake GTK2="USE"
!ENDIF
cd ..
cd ..
$(RESOURCES): image
wiretap\wiretap-$(WTAP_VERSION).lib: wiretap

18
packaging/nsis/Makefile.nmake
View File

@ -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) \

6
packaging/nsis/ethereal.nsi
View File

@ -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