diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2004-02-06 18:47:45 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2004-02-06 18:47:45 +0000 |
commit | 610ff1ee3765cb22313e8e9207f1e333eb2ebc5d (patch) | |
tree | ecaeb9caceab525dc3bd1ad943ea6a903d741e48 | |
parent | 348c83db8cdaacd7540314535056d4f101f199a8 (diff) |
renamed GTK2 version from ethereal2.exe to ethereal-gtk2.exe,
as this is *not* the Ethereal version 2 already.
Some other cleanup done
svn path=/trunk/; revision=9998
-rw-r--r-- | Makefile.nmake | 10 | ||||
-rw-r--r-- | packaging/nsis/Makefile.nmake | 11 | ||||
-rw-r--r-- | packaging/nsis/ethereal.nsi | 68 |
3 files changed, 47 insertions, 42 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index e103037d9f..3bcf752922 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -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.401 2004/02/01 10:11:51 jmayer Exp $ +# $Id: Makefile.nmake,v 1.402 2004/02/06 18:47:43 ulfl Exp $ include config.nmake include <win32.mak> @@ -139,7 +139,7 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GLIB_LIBS) \ $(NET_SNMP_DIR)\win32\lib\netsnmp.lib -EXECUTABLES=ethereal.exe ethereal2.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe +EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res @@ -172,12 +172,12 @@ ethereal.exe : config.h cvsversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan g !ENDIF !IFNDEF GTK2_DIR -ethereal2.exe : +ethereal-gtk2.exe : !ELSE -ethereal2.exe : config.h cvsversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan gtk2 image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins +ethereal-gtk2.exe : config.h cvsversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan gtk2 image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:ethereal2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK2_LIBS) gtk2.tmp\libui.lib $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res + /OUT:ethereal-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK2_LIBS) gtk2.tmp\libui.lib $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res << !ENDIF diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index e55effc631..5b9e94178a 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.35 2004/02/03 20:03:40 ulfl Exp $ +# $Id: Makefile.nmake,v 1.36 2004/02/06 18:47:45 ulfl Exp $ # # NSIS is a free packager/installer/uninstaller program for Win32. # It was originally written for the Winamp package, but various @@ -11,10 +11,8 @@ include ../../config.nmake !IFDEF GTK1 DEST=ethereal -GTK_DIR=$(GTK1_DIR) !ELSE -DEST=ethereal2 -GTK_DIR=$(GTK2_DIR) +DEST=ethereal-gtk2 !ENDIF EXE=../../$(DEST).exe ../../tethereal.exe ../../editcap.exe \ @@ -66,7 +64,8 @@ $(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake /DGTK2 \ !ENDIF /DDEST=$(DEST) \ - /DGTK_DIR=$(GTK_DIR) \ + /DGTK1_DIR=$(GTK1_DIR) \ + /DGTK2_DIR=$(GTK2_DIR) \ /DGLIB_DIR=$(GLIB_DIR) \ /DICONV_DIR=$(ICONV_DIR) \ /DGETTEXT_DIR=$(GETTEXT_DIR) \ @@ -86,7 +85,7 @@ $(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake clean: rm -f ethereal-setup-$(VERSION).exe - rm -f ethereal2-setup-$(VERSION).exe + rm -f ethereal-gtk2-setup-$(VERSION).exe distclean: clean diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 17d110adac..2a6aeb037e 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -1,7 +1,7 @@ ; ; ethereal.nsi ; -; $Id: ethereal.nsi,v 1.44 2004/02/03 20:13:18 ulfl Exp $ +; $Id: ethereal.nsi,v 1.45 2004/02/06 18:47:44 ulfl Exp $ !ifdef MAKENSIS_MODERN_UI @@ -13,7 +13,13 @@ SetCompressor lzma ; Header configuration ; ============================================================================ ; The name of the installer -Name "Ethereal" +!ifndef GTK2 +!define PROGRAM_NAME "Ethereal" +!else +!define PROGRAM_NAME "Ethereal (GTK2)" +!endif + +Name "${PROGRAM_NAME} ${VERSION}" ; The file to write OutFile "${DEST}-setup-${VERSION}.exe" @@ -22,8 +28,8 @@ OutFile "${DEST}-setup-${VERSION}.exe" Icon "..\..\image\ethereal.ico" UninstallIcon "..\..\image\ethereal.ico" -; Uninstall stuff -UninstallText "This will uninstall Ethereal. Hit 'Next' to continue." +; Uninstall stuff (this text isn't used with the MODERN_UI!) */ +UninstallText "This will uninstall Ethereal.\r\nBefore starting the uninstallation, make sure Ethereal is not running.\r\nClick 'Next' to continue." XPStyle on @@ -45,10 +51,10 @@ XPStyle on !define MUI_UNICON "..\..\image\ethereal.ico" !define MUI_COMPONENTSPAGE_SMALLDESC -!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Ethereal.\r\n\r\nBefore starting the installation, make sure Ethereal is not running.\r\n\r\nClick next to continue." +!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Ethereal.\r\n\r\nBefore starting the installation, make sure Ethereal is not running.\r\n\r\nClick 'Next' to continue." !define MUI_FINISHPAGE_LINK "Install WinPcap to be able to capture packets from a network!" !define MUI_FINISHPAGE_LINK_LOCATION "http://winpcap.polito.it" -; show readme doesn't seem to work with NSIS 2.0b4 +; show readme doesn't seem to work even with NSIS 2.0rc3 ;!define MUI_FINISHPAGE_SHOWREADME "..\..\README.win32" ;!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED @@ -160,7 +166,7 @@ SetOutPath $INSTDIR ; Write the uninstall keys for Windows WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "DisplayVersion" "${VERSION}" -WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "DisplayName" "Ethereal ${VERSION}" +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "DisplayName" "${PROGRAM_NAME} ${VERSION}" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "UninstallString" '"$INSTDIR\uninstall.exe"' WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "Publisher" "The Ethereal developer community, http://www.ethereal.com" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "HelpLink" "mailto:ethereal-users@ethereal.com" @@ -171,33 +177,33 @@ WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Unin WriteUninstaller "uninstall.exe" SectionEnd -Section "Ethereal" SecEthereal +Section "${PROGRAM_NAME}" SecEthereal ;------------------------------------------- SetOutPath $INSTDIR -File "..\..\${DEST}.exe" +File /oname=ethereal.exe "..\..\${DEST}.exe" File "..\..\doc\ethereal.html" File "..\..\doc\ethereal-filter.html" !ifndef GTK2 -File "${GTK_DIR}\lib\libgtk-0.dll" -File "${GTK_DIR}\lib\libgdk-0.dll" +File "${GTK1_DIR}\lib\libgtk-0.dll" +File "${GTK1_DIR}\lib\libgdk-0.dll" !else -File "${GTK_DIR}\bin\libgdk-win32-2.0-0.dll" -File "${GTK_DIR}\bin\libgdk_pixbuf-2.0-0.dll" -File "${GTK_DIR}\bin\libgtk-win32-2.0-0.dll" -File "${GTK_DIR}\bin\libatk-1.0-0.dll" -File "${GTK_DIR}\bin\libpango-1.0-0.dll" -File "${GTK_DIR}\bin\libpangowin32-1.0-0.dll" +File "${GTK2_DIR}\bin\libgdk-win32-2.0-0.dll" +File "${GTK2_DIR}\bin\libgdk_pixbuf-2.0-0.dll" +File "${GTK2_DIR}\bin\libgtk-win32-2.0-0.dll" +File "${GTK2_DIR}\bin\libatk-1.0-0.dll" +File "${GTK2_DIR}\bin\libpango-1.0-0.dll" +File "${GTK2_DIR}\bin\libpangowin32-1.0-0.dll" SetOutPath $INSTDIR\etc\gtk-2.0 -File "${GTK_DIR}\etc\gtk-2.0\gdk-pixbuf.loaders" -File "${GTK_DIR}\etc\gtk-2.0\gtk.immodules" +File "${GTK2_DIR}\etc\gtk-2.0\gdk-pixbuf.loaders" +File "${GTK2_DIR}\etc\gtk-2.0\gtk.immodules" SetOutPath $INSTDIR\etc\pango -File "${GTK_DIR}\etc\pango\pango.modules" +File "${GTK2_DIR}\etc\pango\pango.modules" SetOutPath $INSTDIR\lib\gtk-2.0\2.2.0\loaders -File "${GTK_DIR}\lib\gtk-2.0\2.2.0\loaders\libpixbufloader-*.dll" +File "${GTK2_DIR}\lib\gtk-2.0\2.2.0\loaders\libpixbufloader-*.dll" SetOutPath $INSTDIR\lib\gtk-2.0\2.2.0\immodules -File "${GTK_DIR}\lib\gtk-2.0\2.2.0\immodules\im-*.dll" +File "${GTK2_DIR}\lib\gtk-2.0\2.2.0\immodules\im-*.dll" SetOutPath $INSTDIR\lib\pango\1.2.0\modules -File "${GTK_DIR}\lib\pango\1.2.0\modules\pango-*.dll" +File "${GTK2_DIR}\lib\pango\1.2.0\modules\pango-*.dll" !endif SetOutPath $INSTDIR\help File "..\..\help\toc" @@ -278,7 +284,6 @@ WriteINIStr "$SMPROGRAMS\Ethereal\Ethereal Web Site.url" \ CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal.lnk" "$INSTDIR\${DEST}.exe" CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Manual.lnk" "$INSTDIR\ethereal.html" CreateShortCut "$SMPROGRAMS\Ethereal\Display Filters Manual.lnk" "$INSTDIR\ethereal-filter.html" -CreateShortCut "$SMPROGRAMS\Ethereal\Uninstall.lnk" "$INSTDIR\uninstall.exe" CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Program Directory.lnk" \ "$INSTDIR" SectionEnd @@ -302,22 +307,21 @@ IfErrors 0 NoTetherealErrorMsg Abort "Note: tethereal.exe could not be removed! Probably in use! Abort unistall!" NoTetherealErrorMsg: -Delete "$INSTDIR\${DEST}.exe" +Delete "$INSTDIR\ethereal.exe" IfErrors 0 NoEtherealErrorMsg MessageBox MB_OK "Note: Ethereal could not be removed! Probably in use!" IDOK 0 ;skipped if ethereal.exe removed - Abort "Note: ${DEST}.exe could not be removed! Probably in use! Abort uninstall!" + Abort "Note: ethereal.exe could not be removed! Probably in use! Abort uninstall!" NoEtherealErrorMsg: DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" DeleteRegKey HKEY_LOCAL_MACHINE SOFTWARE\Ethereal -!ifdef GTK2 +; regardless if we currently installed GTK1 or 2, try to uninstall GTK2 files too Delete "$INSTDIR\etc\gtk-2.0\*.*" Delete "$INSTDIR\etc\pango\*.*" Delete "$INSTDIR\lib\gtk-2.0\2.2.0\loaders\*.*" Delete "$INSTDIR\lib\gtk-2.0\2.2.0\immodules\*.*" Delete "$INSTDIR\lib\pango\1.2.0\modules\*.*" -!endif Delete "$INSTDIR\help\*.*" Delete "$INSTDIR\plugins\${VERSION}\*.*" Delete "$INSTDIR\plugins\*.*" @@ -328,7 +332,6 @@ Delete "$INSTDIR\*.*" Delete "$SMPROGRAMS\Ethereal\*.*" Delete "$DESKTOP\Ethereal.lnk" -!ifdef GTK2 RMDir "$INSTDIR\etc\gtk-2.0" RMDir "$INSTDIR\etc\pango" RMDir "$INSTDIR\etc" @@ -340,7 +343,6 @@ RMDir "$INSTDIR\lib\pango\1.2.0\modules" RMDir "$INSTDIR\lib\pango\1.2.0" RMDir "$INSTDIR\lib\pango" RMDir "$INSTDIR\lib" -!endif RMDir "$SMPROGRAMS\Ethereal" RMDir "$INSTDIR\help" RMDir "$INSTDIR\plugins\${VERSION}" @@ -359,7 +361,11 @@ SectionEnd !ifdef MAKENSIS_MODERN_UI !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecEthereal} "Ethereal is a GUI network protocol analyzer." +!ifndef GTK2 + !insertmacro MUI_DESCRIPTION_TEXT ${SecEthereal} "${PROGRAM_NAME} is a GUI network protocol analyzer." +!else + !insertmacro MUI_DESCRIPTION_TEXT ${SecEthereal} "${PROGRAM_NAME} is a GUI network protocol analyzer (using the modern GTK2 GUI toolkit)." +!endif !insertmacro MUI_DESCRIPTION_TEXT ${SecTethereal} "Tethereal is a network protocol analyzer." !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Editcap is a program that reads a capture file and writes some or all of the packets into another capture file." !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Text2pcap is a program that reads in an ASCII hex dump and writes the data into a libpcap-style capture file." |