forked from osmocom/wireshark
More GTK+ removal.
Remove GTK+ entries from .gitignore and start removing it from packaging. Change-Id: I70391000906e983eab250c8158b486c3dc6d4a16 Reviewed-on: https://code.wireshark.org/review/26988 Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs
parent
f2aa1cbdec
commit
b56e437160
|
|
@ -56,8 +56,6 @@ wiretap/k12text.c
|
|||
wiretap/version_info.c
|
||||
wireshark-tap-register.c
|
||||
ui/make-taps
|
||||
ui/gtk/wireshark-gresources.c
|
||||
ui/gtk/wireshark-gresources.h
|
||||
|
||||
# Generated makefile system #
|
||||
#############################
|
||||
|
|
@ -227,11 +225,9 @@ Wireshark.sln
|
|||
Wireshark.*.suo
|
||||
x64/
|
||||
_libs_check_
|
||||
/wireshark-gtk*
|
||||
doc/ws.css
|
||||
ui/qt/config.pri
|
||||
packaging/nsis/all-manifest.nsh
|
||||
packaging/nsis/gtk-dll-manifest.nsh
|
||||
/packaging/portableapps/WiresharkPortable/
|
||||
/zlib/
|
||||
|
||||
|
|
|
|||
|
|
@ -16,16 +16,4 @@ if [ ! -d "$WIRESHARK_APP_DIR" ] ; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
APP_NAME=`basename "$0"`
|
||||
|
||||
APP_CONTENTS="$WIRESHARK_APP_DIR/Contents"
|
||||
if [ -f "$APP_CONTENTS/Frameworks/QtWidgets" -o -d "$APP_CONTENTS/Frameworks/QtWidgets.framework" ] ; then
|
||||
# Qt
|
||||
if [ "$APP_NAME" = "wireshark" ] ; then
|
||||
APP_NAME=Wireshark
|
||||
fi
|
||||
exec "$APP_CONTENTS/MacOS/$APP_NAME" "$@"
|
||||
else
|
||||
# GTK+
|
||||
exec "$APP_CONTENTS/Resources/bin/$APP_NAME" "$@"
|
||||
fi
|
||||
exec "$WIRESHARK_APP_DIR/Contents/MacOS/Wireshark" "$@"
|
||||
|
|
|
|||
|
|
@ -806,21 +806,13 @@ Delete "$SMPROGRAMS\${PROGRAM_NAME}\Wireshark Web Site.lnk"
|
|||
|
||||
; Create File Extensions (depending on additional tasks page)
|
||||
; None Associate
|
||||
; XXX Replace with a checkbox.
|
||||
ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 11" "State"
|
||||
StrCmp $0 "1" SecRequired_skip_FileExtensions
|
||||
; GTK+ Associate
|
||||
ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "State"
|
||||
StrCmp $0 "1" SecRequired_GTK_FileExtensions
|
||||
; Qt Associate
|
||||
ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "State"
|
||||
StrCmp $0 "1" SecRequired_QT_FileExtensions
|
||||
|
||||
SecRequired_GTK_FileExtensions:
|
||||
WriteRegStr HKCR ${WIRESHARK_ASSOC} "" "Wireshark capture file"
|
||||
WriteRegStr HKCR "${WIRESHARK_ASSOC}\Shell\open\command" "" '"$INSTDIR\${PROGRAM_NAME_PATH_GTK}" "%1"'
|
||||
WriteRegStr HKCR "${WIRESHARK_ASSOC}\DefaultIcon" "" '"$INSTDIR\${PROGRAM_NAME_PATH_GTK}",1'
|
||||
Goto SecRequired_Associate_FileExtensions
|
||||
|
||||
SecRequired_QT_FileExtensions:
|
||||
WriteRegStr HKCR ${WIRESHARK_ASSOC} "" "Wireshark capture file"
|
||||
WriteRegStr HKCR "${WIRESHARK_ASSOC}\Shell\open\command" "" '"$INSTDIR\${PROGRAM_NAME_PATH_QT}" "%1"'
|
||||
|
|
@ -958,43 +950,6 @@ File "${STAGING_DIR}\tshark.exe"
|
|||
File "${STAGING_DIR}\tshark.html"
|
||||
SectionEnd
|
||||
|
||||
|
||||
!ifdef GTK_DIR
|
||||
Section /o "${PROGRAM_NAME} 1" SecWiresharkGtk
|
||||
;-------------------------------------------
|
||||
SetOutPath $INSTDIR
|
||||
File "${STAGING_DIR}\${PROGRAM_NAME_PATH_GTK}"
|
||||
; Write an entry for ShellExecute
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH_GTK}" "" '$INSTDIR\${PROGRAM_NAME_PATH_GTK}'
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH_GTK}" "Path" '$INSTDIR'
|
||||
|
||||
!include gtk-dll-manifest.nsh
|
||||
|
||||
Push $0
|
||||
|
||||
; Create start menu entries (depending on additional tasks page)
|
||||
ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State"
|
||||
StrCmp $0 "0" SecRequired_skip_StartMenuGtk
|
||||
CreateShortCut "$SMPROGRAMS\${PROGRAM_NAME_GTK}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" "" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" 0 "" "" "${PROGRAM_FULL_NAME_GTK}"
|
||||
SecRequired_skip_StartMenuGtk:
|
||||
|
||||
; Create desktop icon (depending on additional tasks page and command line option)
|
||||
ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State"
|
||||
StrCmp $0 "0" SecRequired_skip_DesktopIconGtk
|
||||
CreateShortCut "$DESKTOP\${PROGRAM_NAME_GTK}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" "" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" 0 "" "" "${PROGRAM_FULL_NAME_GTK}"
|
||||
SecRequired_skip_DesktopIconGtk:
|
||||
|
||||
; Create quick launch icon (depending on additional tasks page and command line option)
|
||||
ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State"
|
||||
StrCmp $0 "0" SecRequired_skip_QuickLaunchIconGtk
|
||||
CreateShortCut "$QUICKLAUNCH\${PROGRAM_NAME_GTK}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" "" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" 0 "" "" "${PROGRAM_FULL_NAME_GTK}"
|
||||
SecRequired_skip_QuickLaunchIconGtk:
|
||||
|
||||
Pop $0
|
||||
SectionEnd ; "SecWiresharkGtk"
|
||||
!endif
|
||||
|
||||
|
||||
SectionGroup "Plugins & Extensions" SecPluginsGroup
|
||||
|
||||
Section "Dissector Plugins" SecPlugins
|
||||
|
|
@ -1191,9 +1146,6 @@ SectionEnd
|
|||
!insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkQt} "The main network protocol analyzer application."
|
||||
!endif
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "Text based network protocol analyzer."
|
||||
!ifdef GTK_DIR
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGtk} "The classic user interface."
|
||||
!endif
|
||||
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} "Plugins and extensions for both ${PROGRAM_NAME} and TShark."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Additional protocol dissectors."
|
||||
|
|
@ -1230,12 +1182,12 @@ SectionEnd
|
|||
; Callback functions
|
||||
; ============================================================================
|
||||
!ifdef QT_DIR
|
||||
; Disable File extensions and icon if Wireshark (Qt / GTK+) isn't selected
|
||||
; Disable File extensions and icon if Wireshark (Qt) isn't selected
|
||||
Function .onSelChange
|
||||
Push $0
|
||||
Goto onSelChange.checkqt
|
||||
|
||||
;Check Wireshark Qt and after check GTK+
|
||||
;Check Wireshark Qt
|
||||
onSelChange.checkqt:
|
||||
SectionGetFlags ${SecWiresharkQt} $0
|
||||
IntOp $0 $0 & ${SF_SELECTED}
|
||||
|
|
@ -1256,7 +1208,7 @@ onSelChange.unselectqt:
|
|||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "Flags" "DISABLED"
|
||||
; Select "None Association"
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 11" "State" 1
|
||||
Goto onSelChange.checkgtk
|
||||
Goto onSelChange.end
|
||||
|
||||
onSelChange.selectqt:
|
||||
; Qt Icon
|
||||
|
|
@ -1272,43 +1224,6 @@ onSelChange.selectqt:
|
|||
; Force None and GTK+ Association to no selected
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 11" "State" 0
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "State" 0
|
||||
Goto onSelChange.checkgtk
|
||||
|
||||
;Check Wireshark GTK+
|
||||
onSelChange.checkgtk:
|
||||
!ifdef GTK_DIR
|
||||
SectionGetFlags ${SecWiresharkGtk} $0
|
||||
IntOp $0 $0 & ${SF_SELECTED}
|
||||
IntCmp $0 0 onSelChange.unselectgtk
|
||||
IntCmp $0 ${SF_SELECTED} onSelChange.selectgtk
|
||||
!endif
|
||||
Goto onSelChange.end
|
||||
|
||||
!ifdef GTK_DIR
|
||||
onSelChange.unselectgtk:
|
||||
;GTK+ Icon
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "Flags" "DISABLED"
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" 0
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" "DISABLED"
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" "DISABLED"
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" 0
|
||||
;GTK+ Association
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" "DISABLED"
|
||||
Goto onSelChange.end
|
||||
|
||||
onSelChange.selectgtk:
|
||||
;GTK+ Icon
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "Flags" ""
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" 1
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" ""
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" ""
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" 1
|
||||
;GTK+ Association
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" ""
|
||||
Goto onSelChange.end
|
||||
!endif
|
||||
|
||||
onSelChange.end:
|
||||
Pop $0
|
||||
|
|
@ -1325,19 +1240,6 @@ Var USBPCAP_NAME ; DisplayName from USBPcap installation
|
|||
|
||||
Function myShowCallback
|
||||
|
||||
!ifdef GTK_DIR
|
||||
; If GTK+ is available enable icon and associate from additional tasks
|
||||
; GTK+ Icon
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "Flags" ""
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" 1
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" ""
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" ""
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" 1
|
||||
;Qt Association
|
||||
WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" ""
|
||||
!endif
|
||||
|
||||
ClearErrors
|
||||
; detect if WinPcap should be installed
|
||||
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap ${PCAP_DISPLAY_VERSION}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue