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

remove the MAKENSIS_MODERN_UI, as the modern UI of NSIS is very stable now so there's no need for this setting any longer (removing some unnecessary complexity) 

svn path=/trunk/; revision=19096
This commit is contained in:
Ulf Lamping 2006-08-30 23:25:15 +00:00
parent 2f9fe3a928
commit 85c1588650
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packaging/nsis/Makefile.nmake
View File

@ -109,9 +109,6 @@ NEWS.txt: ../../NEWS
$(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
$(MAKENSIS) \
/DDEST=$(DEST) \
!IF "$(MAKENSIS_MODERN_UI)" != ""
/DMAKENSIS_MODERN_UI=$(MAKENSIS_MODERN_UI) \
!ENDIF
!IF "$(ENABLE_LIBWIRESHARK)" != ""
/DENABLE_LIBWIRESHARK=$(ENABLE_LIBWIRESHARK) \
!ENDIF

8
packaging/nsis/wireshark.nsi
View File

@ -4,14 +4,12 @@
; $Id$
!ifdef MAKENSIS_MODERN_UI
; Set the compression mechanism first.
; As of NSIS 2.07, solid compression which makes installer about 1MB smaller
; is no longer the default, so use the /SOLID switch.
; This unfortunately is unknown to NSIS prior to 2.07 and creates an error.
; So if you get an error here, please update to at least NSIS 2.07!
SetCompressor /SOLID lzma
!endif
!ifdef GTK1_DIR & GTK2_DIR
InstType "Wireshark (GTK2 user interface)"
@ -51,7 +49,6 @@ UninstallIcon "..\..\image\wireshark.ico"
XPStyle on
!ifdef MAKENSIS_MODERN_UI
; ============================================================================
; Modern UI
@ -114,8 +111,6 @@ Page custom DisplayWinPcapPage
!insertmacro MUI_LANGUAGE "English"
!endif ; MAKENSIS_MODERN_UI
; ============================================================================
; Reserve Files
; ============================================================================
@ -1020,7 +1015,6 @@ SectionEnd
; ============================================================================
; PLEASE MAKE SURE, THAT THE DESCRIPTIVE TEXT FITS INTO THE DESCRIPTION FIELD!
; ============================================================================
!ifdef MAKENSIS_MODERN_UI
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGroup} "${PROGRAM_NAME} is a GUI network protocol analyzer."
!ifdef GTK1_DIR
@ -1057,8 +1051,6 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${un.SecWinPcap} "Call WinPcap's uninstall program."
!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
!endif ; MAKENSIS_MODERN_UI
; ============================================================================
; Callback functions
; ============================================================================