diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-08-30 23:25:15 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-08-30 23:25:15 +0000 |
| commit | 85c15886508615d18ab7c211db9622d0a05a538e (patch) | |
| tree | aca09bcb0835d260d8f373bf0b0982fbc74c0094 /packaging | |
| parent | 2f9fe3a928c6da635a5028ef9c0d35289eeaf126 (diff) | |
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
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 3 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 049935a0aa..e929ae4683 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -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 diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 75c2f37ccd..654857dfe3 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -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 ; ============================================================================ |