forked from osmocom/wireshark
Rename Logwolf to Logray
Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.pespin/osmux-wip
Gerald Combs
parent
78ebafd708
commit
75efbb1ac4
160
CMakeLists.txt
160
CMakeLists.txt
|
|
@ -30,10 +30,10 @@ endif()
|
|||
|
||||
if(WIN32)
|
||||
set(_project_name Wireshark)
|
||||
set(_log_project_name Logwolf)
|
||||
set(_log_project_name Logray)
|
||||
else()
|
||||
set(_project_name wireshark)
|
||||
set(_log_project_name logwolf)
|
||||
set(_log_project_name logray)
|
||||
endif()
|
||||
|
||||
project(${_project_name} C CXX)
|
||||
|
|
@ -1181,7 +1181,7 @@ ws_find_package(AIRPCAP ENABLE_AIRPCAP HAVE_AIRPCAP)
|
|||
ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
|
||||
|
||||
# Build one of the Qt GUIs?
|
||||
if(BUILD_wireshark OR BUILD_logwolf)
|
||||
if(BUILD_wireshark OR BUILD_logray)
|
||||
if(USE_qt6)
|
||||
set(qtver "6")
|
||||
if(DEFINED ENV{WIRESHARK_QT6_PREFIX_PATH})
|
||||
|
|
@ -1305,7 +1305,7 @@ ws_find_package(ILBC ENABLE_ILBC HAVE_ILBC)
|
|||
|
||||
ws_find_package(OPUS ENABLE_OPUS HAVE_OPUS)
|
||||
|
||||
if (BUILD_logwolf)
|
||||
if (BUILD_logray)
|
||||
# libsinsp+libscap, required for falco-bridge
|
||||
ws_find_package(Sinsp ENABLE_SINSP HAVE_SINSP)
|
||||
endif()
|
||||
|
|
@ -1342,7 +1342,7 @@ find_package( Asciidoctor 1.5 )
|
|||
find_package(DOXYGEN)
|
||||
|
||||
# The SpeexDSP resampler is required iff building wireshark or sharkd.
|
||||
if(BUILD_wireshark OR BUILD_logwolf OR BUILD_sharkd)
|
||||
if(BUILD_wireshark OR BUILD_logray OR BUILD_sharkd)
|
||||
# We don't provide a binary package for SpeexDSP in our repository.
|
||||
# If using the repository don't bother searching for a system SpeexDSP
|
||||
# installation and just use the bundled resampler code instead.
|
||||
|
|
@ -1578,8 +1578,8 @@ if(BUILD_wireshark AND QT_FOUND)
|
|||
add_subdirectory( ui/qt )
|
||||
endif()
|
||||
|
||||
if(BUILD_logwolf AND QT_FOUND)
|
||||
add_subdirectory( ui/logwolf )
|
||||
if(BUILD_logray AND QT_FOUND)
|
||||
add_subdirectory( ui/logray )
|
||||
endif()
|
||||
|
||||
# Location of our plugins. PLUGIN_DIR should allow running
|
||||
|
|
@ -1611,9 +1611,9 @@ if(ENABLE_PLUGINS)
|
|||
plugins/codecs/l16_mono
|
||||
${CUSTOM_PLUGIN_SRC_DIR}
|
||||
)
|
||||
set(LOGWOLF_PLUGIN_SRC_DIRS)
|
||||
set(LOGRAY_PLUGIN_SRC_DIRS)
|
||||
if(SINSP_FOUND)
|
||||
list(APPEND LOGWOLF_PLUGIN_SRC_DIRS
|
||||
list(APPEND LOGRAY_PLUGIN_SRC_DIRS
|
||||
plugins/epan/falco_bridge
|
||||
)
|
||||
endif()
|
||||
|
|
@ -1654,7 +1654,7 @@ if(ENABLE_PLUGINS)
|
|||
|
||||
else()
|
||||
set(PLUGIN_SRC_DIRS )
|
||||
set(LOGWOLF_PLUGIN_SRC_DIRS )
|
||||
set(LOGRAY_PLUGIN_SRC_DIRS )
|
||||
endif()
|
||||
|
||||
if(ENABLE_APPLICATION_BUNDLE)
|
||||
|
|
@ -1665,22 +1665,22 @@ if(ENABLE_APPLICATION_BUNDLE)
|
|||
set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/PlugIns/wireshark/${PLUGIN_PATH_ID}")
|
||||
endif()
|
||||
if(CMAKE_CFG_INTDIR STREQUAL ".")
|
||||
set(_logwolf_plugin_dir "${CMAKE_BINARY_DIR}/run/Logwolf.app/Contents/PlugIns/logwolf/${PLUGIN_PATH_ID}")
|
||||
set(_logray_plugin_dir "${CMAKE_BINARY_DIR}/run/Logray.app/Contents/PlugIns/logray/${PLUGIN_PATH_ID}")
|
||||
else()
|
||||
# Xcode
|
||||
set(_logwolf_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Logwolf.app/Contents/PlugIns/logwolf/${PLUGIN_PATH_ID}")
|
||||
set(_logray_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Logray.app/Contents/PlugIns/logray/${PLUGIN_PATH_ID}")
|
||||
endif()
|
||||
elseif(WIN32 AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
|
||||
set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/${PLUGIN_VERSION_DIR}")
|
||||
set(_logwolf_plugin_dir ${_plugin_dir})
|
||||
set(_logray_plugin_dir ${_plugin_dir})
|
||||
else()
|
||||
set(_plugin_dir "${DATAFILE_DIR}/${PLUGIN_VERSION_DIR}")
|
||||
set(_logwolf_plugin_dir ${_plugin_dir})
|
||||
set(_logray_plugin_dir ${_plugin_dir})
|
||||
endif()
|
||||
set (PLUGIN_DIR ${_plugin_dir} CACHE INTERNAL "Build time plugin location.")
|
||||
set (LOGWOLF_PLUGIN_DIR ${_logwolf_plugin_dir} CACHE INTERNAL "Build time Logwolf plugin location.")
|
||||
set (LOGRAY_PLUGIN_DIR ${_logray_plugin_dir} CACHE INTERNAL "Build time Logray plugin location.")
|
||||
|
||||
foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS} ${LOGWOLF_PLUGIN_SRC_DIRS})
|
||||
foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS} ${LOGRAY_PLUGIN_SRC_DIRS})
|
||||
add_subdirectory( ${_plugin_src_dir} )
|
||||
endforeach()
|
||||
|
||||
|
|
@ -1734,12 +1734,12 @@ set(CFG_OUT_FILES
|
|||
wireshark.pc
|
||||
)
|
||||
|
||||
if(BUILD_logwolf)
|
||||
if(BUILD_logray)
|
||||
list(APPEND CFG_OUT_FILES
|
||||
packaging/macosx/LogwolfInfo.plist
|
||||
packaging/macosx/logwolf-app.dmgbuild
|
||||
packaging/macosx/logwolf-dsym.dmgbuild
|
||||
resources/logwolf.exe.manifest
|
||||
packaging/macosx/LograyInfo.plist
|
||||
packaging/macosx/logray-app.dmgbuild
|
||||
packaging/macosx/logray-dsym.dmgbuild
|
||||
resources/logray.exe.manifest
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -2428,20 +2428,20 @@ if(BUILD_wireshark AND QT_FOUND)
|
|||
set_executable_resources(wireshark "Wireshark" UNIQUE_RC)
|
||||
endif()
|
||||
|
||||
if(BUILD_logwolf AND QT_FOUND)
|
||||
set(LOGWOLF_SRC
|
||||
if(BUILD_logray AND QT_FOUND)
|
||||
set(LOGRAY_SRC
|
||||
file.c
|
||||
fileset.c
|
||||
${PLATFORM_UI_SRC}
|
||||
)
|
||||
set(logwolf_FILES
|
||||
set(logray_FILES
|
||||
$<TARGET_OBJECTS:capture_opts>
|
||||
$<TARGET_OBJECTS:ui_logwolf>
|
||||
$<TARGET_OBJECTS:ui_logray>
|
||||
$<TARGET_OBJECTS:shark_common>
|
||||
${LOGWOLF_SRC}
|
||||
${LOGRAY_SRC}
|
||||
${PLATFORM_UI_RC_FILES}
|
||||
)
|
||||
set_executable_resources(logwolf "Logwolf" UNIQUE_RC)
|
||||
set_executable_resources(logray "Logray" UNIQUE_RC)
|
||||
endif()
|
||||
|
||||
if(ENABLE_APPLICATION_BUNDLE)
|
||||
|
|
@ -2615,8 +2615,8 @@ if(BUILD_wireshark AND QT_FOUND)
|
|||
endif(QT_WINDEPLOYQT_EXECUTABLE)
|
||||
endif()
|
||||
|
||||
if(BUILD_logwolf AND QT_FOUND)
|
||||
set(logwolf_LIBS
|
||||
if(BUILD_logray AND QT_FOUND)
|
||||
set(logray_LIBS
|
||||
ui
|
||||
capchild
|
||||
caputils
|
||||
|
|
@ -2637,12 +2637,12 @@ if(BUILD_logwolf AND QT_FOUND)
|
|||
${MINIZIP_LIBRARIES}
|
||||
)
|
||||
|
||||
add_executable(logwolf WIN32 MACOSX_BUNDLE ${logwolf_FILES} ${EXTRA_BUNDLE_FILES})
|
||||
add_executable(logray WIN32 MACOSX_BUNDLE ${logray_FILES} ${EXTRA_BUNDLE_FILES})
|
||||
if(WIN32 AND NOT BUILD_wireshark)
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT logwolf)
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT logray)
|
||||
endif()
|
||||
set(PROGLIST ${PROGLIST} logwolf)
|
||||
set_target_properties(logwolf PROPERTIES
|
||||
set(PROGLIST ${PROGLIST} logray)
|
||||
set_target_properties(logray PROPERTIES
|
||||
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||
FOLDER "Executables"
|
||||
INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
|
||||
|
|
@ -2651,44 +2651,44 @@ if(BUILD_logwolf AND QT_FOUND)
|
|||
AUTORCC ON
|
||||
)
|
||||
if(MSVC)
|
||||
set_target_properties(logwolf PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
|
||||
set_target_properties(logray PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
|
||||
endif()
|
||||
if(ENABLE_APPLICATION_BUNDLE OR WIN32)
|
||||
set_target_properties(logwolf PROPERTIES OUTPUT_NAME Logwolf)
|
||||
set_target_properties(logray PROPERTIES OUTPUT_NAME Logray)
|
||||
endif()
|
||||
|
||||
if(ENABLE_APPLICATION_BUNDLE)
|
||||
if(ASCIIDOCTOR_FOUND)
|
||||
# Make sure to generate files referenced by
|
||||
# BUNDLE_RESOURCE_SHARE_MAN1_FILES
|
||||
add_dependencies(logwolf manpages)
|
||||
add_dependencies(logray manpages)
|
||||
endif()
|
||||
set_target_properties(
|
||||
logwolf PROPERTIES
|
||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/packaging/macosx/LogwolfInfo.plist
|
||||
logray PROPERTIES
|
||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/packaging/macosx/LograyInfo.plist
|
||||
)
|
||||
if(CMAKE_CFG_INTDIR STREQUAL ".")
|
||||
# Add a wrapper script which opens the bundle. This adds
|
||||
# convenience but makes debugging more difficult.
|
||||
# It is not created if using Xcode
|
||||
# XXX Running run/Logwolf.app/Contents/MacOS/Logwolf works
|
||||
# XXX Running run/Logray.app/Contents/MacOS/Logray works
|
||||
# fine for me (Gerald) here on Mojave. Can we just make this a
|
||||
# symlink?
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/run/logwolf)
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/run/logwolf "#!/bin/sh\n")
|
||||
file(APPEND ${CMAKE_BINARY_DIR}/run/logwolf "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n")
|
||||
file(APPEND ${CMAKE_BINARY_DIR}/run/logwolf "# Wrapper script which should work around the issue described at\n")
|
||||
file(APPEND ${CMAKE_BINARY_DIR}/run/logwolf "# https://stackoverflow.com/questions/25318524/what-exactly-should-i-pass-to-nsapp-activateignoringotherapps-to-get-my-appl\n")
|
||||
file(APPEND ${CMAKE_BINARY_DIR}/run/logwolf "exec ${CMAKE_BINARY_DIR}/run/Logwolf.app/Contents/MacOS/Logwolf \"\$\@\"\n")
|
||||
execute_process(COMMAND chmod a+x ${CMAKE_BINARY_DIR}/run/logwolf)
|
||||
file(REMOVE ${CMAKE_BINARY_DIR}/run/logray)
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/run/logray "#!/bin/sh\n")
|
||||
file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n")
|
||||
file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# Wrapper script which should work around the issue described at\n")
|
||||
file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# https://stackoverflow.com/questions/25318524/what-exactly-should-i-pass-to-nsapp-activateignoringotherapps-to-get-my-appl\n")
|
||||
file(APPEND ${CMAKE_BINARY_DIR}/run/logray "exec ${CMAKE_BINARY_DIR}/run/Logray.app/Contents/MacOS/Logray \"\$\@\"\n")
|
||||
execute_process(COMMAND chmod a+x ${CMAKE_BINARY_DIR}/run/logray)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
target_link_libraries(logwolf ${logwolf_LIBS})
|
||||
target_include_directories(logwolf SYSTEM PRIVATE ${SPARKLE_INCLUDE_DIRS})
|
||||
target_link_libraries(logray ${logray_LIBS})
|
||||
target_include_directories(logray SYSTEM PRIVATE ${SPARKLE_INCLUDE_DIRS})
|
||||
|
||||
install(
|
||||
TARGETS logwolf
|
||||
TARGETS logray
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
)
|
||||
|
|
@ -2705,26 +2705,26 @@ if(BUILD_logwolf AND QT_FOUND)
|
|||
--no-compiler-runtime
|
||||
--verbose 0
|
||||
$<$<BOOL:${MSVC}>:--pdb>
|
||||
"$<TARGET_FILE:logwolf>"
|
||||
"$<TARGET_FILE:logray>"
|
||||
)
|
||||
add_dependencies(copy_ls_qt_dlls logwolf)
|
||||
add_dependencies(copy_ls_qt_dlls logray)
|
||||
|
||||
install(CODE "execute_process(COMMAND
|
||||
\"${QT_WINDEPLOYQT_EXECUTABLE}\"
|
||||
--no-compiler-runtime
|
||||
\"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/Logwolf.exe\")"
|
||||
\"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/Logray.exe\")"
|
||||
)
|
||||
|
||||
endif(QT_WINDEPLOYQT_EXECUTABLE)
|
||||
endif()
|
||||
|
||||
if (BUILD_logwolf AND SINSP_FOUND)
|
||||
if (BUILD_logray AND SINSP_FOUND)
|
||||
add_custom_target(copy_falco_plugins)
|
||||
add_custom_command(TARGET copy_falco_plugins
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory ${LOGWOLF_PLUGIN_DIR}/falco
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SINSP_PLUGINS} ${LOGWOLF_PLUGIN_DIR}/falco
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory ${LOGRAY_PLUGIN_DIR}/falco
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SINSP_PLUGINS} ${LOGRAY_PLUGIN_DIR}/falco
|
||||
)
|
||||
add_dependencies(logwolf copy_falco_plugins)
|
||||
add_dependencies(logray copy_falco_plugins)
|
||||
endif()
|
||||
|
||||
# Common properties for CLI executables
|
||||
|
|
@ -3105,10 +3105,10 @@ if(BUILD_dumpcap AND PCAP_FOUND)
|
|||
endif()"
|
||||
)
|
||||
endif()
|
||||
if(BUILD_logwolf AND ENABLE_APPLICATION_BUNDLE)
|
||||
if(BUILD_logray AND ENABLE_APPLICATION_BUNDLE)
|
||||
add_custom_command(TARGET dumpcap POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
$<TARGET_FILE:dumpcap> run/Logwolf.app/Contents/MacOS/dumpcap
|
||||
$<TARGET_FILE:dumpcap> run/Logray.app/Contents/MacOS/dumpcap
|
||||
)
|
||||
endif()
|
||||
elseif(BUILD_dumpcap AND ENABLE_PCAP)
|
||||
|
|
@ -3358,54 +3358,54 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark)
|
|||
|
||||
endif()
|
||||
|
||||
if(ENABLE_APPLICATION_BUNDLE AND BUILD_logwolf)
|
||||
add_custom_target(logwolf_app_bundle)
|
||||
set_target_properties(logwolf_app_bundle PROPERTIES FOLDER "Copy Tasks")
|
||||
add_custom_command(TARGET logwolf_app_bundle
|
||||
if(ENABLE_APPLICATION_BUNDLE AND BUILD_logray)
|
||||
add_custom_target(logray_app_bundle)
|
||||
set_target_properties(logray_app_bundle PROPERTIES FOLDER "Copy Tasks")
|
||||
add_custom_command(TARGET logray_app_bundle
|
||||
POST_BUILD
|
||||
COMMAND "${CMAKE_BINARY_DIR}/packaging/macosx/osx-app.sh" --bundle Logwolf.app
|
||||
COMMAND "${CMAKE_BINARY_DIR}/packaging/macosx/osx-app.sh" --bundle Logray.app
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/run"
|
||||
)
|
||||
|
||||
add_custom_target(logwolf_dmg_prep DEPENDS logwolf_app_bundle)
|
||||
add_custom_target(logray_dmg_prep DEPENDS logray_app_bundle)
|
||||
|
||||
FILE(MAKE_DIRECTORY packaging/macosx/logwolf)
|
||||
FILE(MAKE_DIRECTORY packaging/macosx/logray)
|
||||
|
||||
set(_logwolf_read_me_first "packaging/macosx/logwolf/Read me first.html")
|
||||
set(_logray_read_me_first "packaging/macosx/logray/Read me first.html")
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT
|
||||
${_logwolf_read_me_first}
|
||||
${_logray_read_me_first}
|
||||
COMMAND ${ASCIIDOCTOR_EXECUTABLE}
|
||||
--backend html
|
||||
--out-file ${_logwolf_read_me_first}
|
||||
--out-file ${_logray_read_me_first}
|
||||
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
|
||||
--attribute min-macos-version=${MIN_MACOS_VERSION}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logwolf_read_me_first.adoc
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_read_me_first.adoc
|
||||
DEPENDS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logwolf_read_me_first.adoc
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_read_me_first.adoc
|
||||
)
|
||||
|
||||
set(_logwolf_dsym_installation "packaging/macosx/logwolf/Debugging symbols installation.html")
|
||||
set(_logray_dsym_installation "packaging/macosx/logray/Debugging symbols installation.html")
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT
|
||||
${_logwolf_dsym_installation}
|
||||
${_logray_dsym_installation}
|
||||
COMMAND ${ASCIIDOCTOR_EXECUTABLE}
|
||||
--backend html
|
||||
--out-file ${_logwolf_dsym_installation}
|
||||
--out-file ${_logray_dsym_installation}
|
||||
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logwolf_dsym_installation.adoc
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_dsym_installation.adoc
|
||||
DEPENDS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logwolf_dsym_installation.adoc
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_dsym_installation.adoc
|
||||
)
|
||||
|
||||
add_custom_target(logwolf_dmg_readmes DEPENDS ${_logwolf_read_me_first} ${_logwolf_dsym_installation} )
|
||||
add_dependencies(logwolf_dmg_prep logwolf_dmg_readmes)
|
||||
add_custom_target(logray_dmg_readmes DEPENDS ${_logray_read_me_first} ${_logray_dsym_installation} )
|
||||
add_dependencies(logray_dmg_prep logray_dmg_readmes)
|
||||
|
||||
ADD_CUSTOM_TARGET( logwolf_dmg
|
||||
COMMAND bash -x ${CMAKE_BINARY_DIR}/packaging/macosx/osx-dmg.sh --app-name Logwolf
|
||||
ADD_CUSTOM_TARGET( logray_dmg
|
||||
COMMAND bash -x ${CMAKE_BINARY_DIR}/packaging/macosx/osx-dmg.sh --app-name Logray
|
||||
# Unlike wireshark_nsis_prep + wireshark_nsis, we can add a direct
|
||||
# dependency here.
|
||||
DEPENDS logwolf_dmg_prep
|
||||
DEPENDS logray_dmg_prep
|
||||
# We create Wireshark.app in "run". Do our work there.
|
||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/run
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Build options for use by CMake
|
||||
|
||||
option(BUILD_wireshark "Build Wireshark" ON)
|
||||
option(BUILD_logwolf "Build Logwolf" OFF)
|
||||
if(BUILD_wireshark OR BUILD_logwolf)
|
||||
option(BUILD_logray "Build Logray" OFF)
|
||||
if(BUILD_wireshark OR BUILD_logray)
|
||||
if(DEFINED ENV{WIRESHARK_QT6_PREFIX_PATH})
|
||||
option(USE_qt6 "Use Qt6 instead of Qt5" ON)
|
||||
else()
|
||||
|
|
|
|||
|
|
@ -58,11 +58,11 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
|
|||
ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
|
||||
endmacro()
|
||||
|
||||
macro(ADD_LOGWOLF_PLUGIN_LIBRARY _plugin _subfolder)
|
||||
macro(ADD_LOGRAY_PLUGIN_LIBRARY _plugin _subfolder)
|
||||
ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
|
||||
|
||||
set_target_properties(${_plugin} PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${LOGWOLF_PLUGIN_DIR}/${_subfolder}
|
||||
LIBRARY_OUTPUT_DIRECTORY ${LOGRAY_PLUGIN_DIR}/${_subfolder}
|
||||
)
|
||||
endmacro()
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#define VERSION_MINOR ${PROJECT_MINOR_VERSION}
|
||||
#define VERSION_MICRO ${PROJECT_PATCH_VERSION}
|
||||
|
||||
/* Version number of Logwolf and associated utilities */
|
||||
/* Version number of Logray and associated utilities */
|
||||
#define LOG_VERSION "${LOG_PROJECT_VERSION}${VERSION_EXTRA}"
|
||||
|
||||
#define PLUGIN_PATH_ID "${PLUGIN_PATH_ID}"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Common attributes
|
||||
|
||||
:wireshark-version: 3.7.2
|
||||
:logwolf-version: 0.9.0
|
||||
:logray-version: 0.9.0
|
||||
|
||||
// Required for btn, kbd:, and menu: macros.
|
||||
:experimental:
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
= Logwolf Quick Start
|
||||
= Logray Quick Start
|
||||
|
||||
Logwolf is a sibling application for Wireshark which focuses on log messages.
|
||||
Logray is a sibling application for Wireshark which focuses on log messages.
|
||||
It helps people understand, troubleshoot, and secure their systems via log messages similar to the way Wireshark helps people understand, troubleshoot, and secure their networks via packets.
|
||||
|
||||
This document provides brief instructions for building Logwolf until more complete documentation comparable to the Wireshark Developer’s and User’s Guides can be written.
|
||||
This document provides brief instructions for building Logray until more complete documentation comparable to the Wireshark Developer’s and User’s Guides can be written.
|
||||
|
||||
== Building Logwolf
|
||||
== Building Logray
|
||||
|
||||
Logwolf requires the same build environment as Wireshark.
|
||||
Logray requires the same build environment as Wireshark.
|
||||
See the https://www.wireshark.org/docs/wsdg_html_chunked/[Wireshark Developer’s Guide] for instructions on setting that up.
|
||||
|
||||
It additionally requires libsinsp and libscap from https://github.com/falcosecurity/libs/[falcosecurity/libs] and any desired plugins from https://github.com/falcosecurity/plugins/[falcosecurity/plugins].
|
||||
|
||||
In order to build Logwolf, do the following:
|
||||
In order to build Logray, do the following:
|
||||
|
||||
1. https://falco.org/docs/getting-started/source/[Build falcosecurity/libs].
|
||||
|
||||
|
|
@ -22,31 +22,31 @@ In order to build Logwolf, do the following:
|
|||
+
|
||||
--
|
||||
[horizontal]
|
||||
BUILD_logwolf:: Must be enabled, e.g. set to ON
|
||||
BUILD_logray:: Must be enabled, e.g. set to ON
|
||||
SINSP_INCLUDEDIR:: The path to your local falcosecurity/libs directory
|
||||
SINSP_LIBDIR:: The path to your falcosecurity/libs build directory
|
||||
--
|
||||
|
||||
4. Create a directory named `falco` in your Logwolf plugins directory, and either copy in or symlink any desired Falco plugins.
|
||||
4. Create a directory named `falco` in your Logray plugins directory, and either copy in or symlink any desired Falco plugins.
|
||||
|
||||
.Example 1: Building on macOS using Ninja
|
||||
[sh]
|
||||
----
|
||||
cmake -G Ninja \
|
||||
-DBUILD_logwolf=ON \
|
||||
-DBUILD_logray=ON \
|
||||
-DSINSP_INCLUDEDIR=/path/to/falcosecurity/libs \
|
||||
-DSINSP_LIBDIR=/path/to/falcosecurity/libs/build \
|
||||
..
|
||||
ninja
|
||||
mkdir run/Logwolf.app/Contents/PlugIns/logwolf/3-7/falco
|
||||
(cd run/Logwolf.app/Contents/PlugIns/logwolf/3-7/falco ; ln -sn /path/to/falcosecurity-plugins/plugins/cloudtrail/libcloudtrail.so )
|
||||
mkdir run/Logray.app/Contents/PlugIns/logray/3-7/falco
|
||||
(cd run/Logray.app/Contents/PlugIns/logray/3-7/falco ; ln -sn /path/to/falcosecurity-plugins/plugins/cloudtrail/libcloudtrail.so )
|
||||
----
|
||||
|
||||
.Example 2: Building on Linux using Make
|
||||
[sh]
|
||||
----
|
||||
cmake \
|
||||
-DBUILD_logwolf=ON \
|
||||
-DBUILD_logray=ON \
|
||||
-DSINSP_INCLUDEDIR=/path/to/falcosecurity/libs \
|
||||
-DSINSP_LIBDIR=/path/to/falcosecurity/libs/build \
|
||||
..
|
||||
|
|
@ -171,7 +171,7 @@ https://appimage.org[AppImage] package::
|
|||
Build the `wireshark_appimage` target.
|
||||
|
||||
macOS .dmg package containing an application bundle::
|
||||
Build the `wireshark_dmg` or `logwolf_dmg` targets.
|
||||
Build the `wireshark_dmg` or `logray_dmg` targets.
|
||||
|
||||
Installable packages typically require building Wireshark first.
|
||||
|
||||
|
|
|
|||
|
|
@ -1011,9 +1011,9 @@ In your build directory, type:
|
|||
|
||||
[source,sh]
|
||||
----
|
||||
ninja wireshark_dmg logwolf_dmg # (Modify as needed)
|
||||
ninja wireshark_dmg logray_dmg # (Modify as needed)
|
||||
# ...or, if you're using GNU make...
|
||||
make wireshark_dmg logwolf_dmg # (Modify as needed)
|
||||
make wireshark_dmg logray_dmg # (Modify as needed)
|
||||
----
|
||||
|
||||
to build the macOS Packages.
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ WSLUA_FUNCTION wslua_register_menu(lua_State* L) { /* Register a menu item in o
|
|||
* MENU_ANALYZE_CONVERSATION: menu:Analyze[Conversation Filter]
|
||||
* MENU_TOOLS_UNSORTED: menu:Tools[]
|
||||
|
||||
Valid log (Logwolf) items are:
|
||||
Valid log (Logray) items are:
|
||||
* MENU_LOG_ANALYZE_UNSORTED: menu:Analyze[]
|
||||
* MENU_LOG_STAT_UNSORTED = 16
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>Logwolf</string>
|
||||
<string>Logray</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>@LOG_PROJECT_VERSION@, Copyright 1998-2022 Wireshark Development Team</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>Wireshark.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.wireshark.Logwolf</string>
|
||||
<string>org.wireshark.Logray</string>
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
|
||||
<!-- Sparkle settings https://sparkle-project.org/documentation/customization/ -->
|
||||
<key>SUFeedURL</key>
|
||||
<string>https://www.wireshark.org/update/0/Logwolf/@LOG_PROJECT_MAJOR_VERSION@.@LOG_PROJECT_MINOR_VERSION@.@PROJECT_PATCH_VERSION@/macOS/x86-64/en-US/stable.xml</string>
|
||||
<string>https://www.wireshark.org/update/0/Logray/@LOG_PROJECT_MAJOR_VERSION@.@LOG_PROJECT_MINOR_VERSION@.@PROJECT_PATCH_VERSION@/macOS/x86-64/en-US/stable.xml</string>
|
||||
<key>SUEnableAutomaticChecks</key>
|
||||
<false/>
|
||||
<key>SUPublicEDKey</key>
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
// Required attributes:
|
||||
// include-dir
|
||||
|
||||
include::{include-dir}/attributes.adoc[]
|
||||
:stylesheet: {include-dir}/ws.css
|
||||
|
||||
== Debugging Symbols for Logray
|
||||
|
||||
This archive contains the debugging symbols for Logray {logray-version}.
|
||||
The debugging symbols are only necessary if Logray is crashing and you need to report an issue to the Logray development team.
|
||||
|
||||
WARNING: This won't work properly with any version other than Logray {logray-version}.
|
||||
|
||||
To install the symbols, drag _Logray.dSYM_ to the same location as _Logray_.
|
||||
This is usually your _Applications_ folder.
|
||||
|
||||
To uninstall, drag _Logray.dSYM_ to the trash.
|
||||
|
|
@ -7,28 +7,28 @@ include::{include-dir}/attributes.adoc[]
|
|||
|
||||
== Before You Begin
|
||||
|
||||
This release of Logwolf requires macOS {min-macos-version} or later.
|
||||
This release of Logray requires macOS {min-macos-version} or later.
|
||||
If you are running an earlier version of macOS you can install using another packaging system such as Homebrew or MacPorts.
|
||||
|
||||
== Quick Setup
|
||||
|
||||
To install Logwolf, drag the _Logwolf_ application bundle to the _Applications_ folder.
|
||||
To install Logray, drag the _Logray_ application bundle to the _Applications_ folder.
|
||||
|
||||
////
|
||||
If you would like to add the path to
|
||||
https://www.wireshark.org/docs/man-pages/wireshark.html[Logwolf],
|
||||
https://www.wireshark.org/docs/man-pages/wireshark.html[Logray],
|
||||
https://www.wireshark.org/docs/man-pages/tshark.html[TShark],
|
||||
https://www.wireshark.org/docs/man-pages/capinfos.html[capinfos],
|
||||
https://www.wireshark.org/docs/man-pages/editcap.html[editcap],
|
||||
and
|
||||
https://www.wireshark.org/docs/man-pages/[other command line utilities]
|
||||
to the system PATH, install the
|
||||
link:Logwolf.app/Contents/Resources/Extras/Add%20Wireshark%20to%20the%20system%20path.pkg[Add Logwolf to the system path]
|
||||
link:Logray.app/Contents/Resources/Extras/Add%20Wireshark%20to%20the%20system%20path.pkg[Add Logray to the system path]
|
||||
package.
|
||||
////
|
||||
|
||||
== Uninstalling
|
||||
|
||||
To uninstall Logwolf, do the following:
|
||||
To uninstall Logray, do the following:
|
||||
|
||||
. Remove _/Applications/Logwolf.app_
|
||||
. Remove _/Applications/Logray.app_
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
// Required attributes:
|
||||
// include-dir
|
||||
|
||||
include::{include-dir}/attributes.adoc[]
|
||||
:stylesheet: {include-dir}/ws.css
|
||||
|
||||
== Debugging Symbols for Logwolf
|
||||
|
||||
This archive contains the debugging symbols for Logwolf {logwolf-version}.
|
||||
The debugging symbols are only necessary if Logwolf is crashing and you need to report an issue to the Logwolf development team.
|
||||
|
||||
WARNING: This won't work properly with any version other than Logwolf {logwolf-version}.
|
||||
|
||||
To install the symbols, drag _Logwolf.dSYM_ to the same location as _Logwolf_.
|
||||
This is usually your _Applications_ folder.
|
||||
|
||||
To uninstall, drag _Logwolf.dSYM_ to the trash.
|
||||
|
|
@ -19,15 +19,15 @@ import os.path
|
|||
# .. Useful stuff ..............................................................
|
||||
|
||||
lw_version = '@LOG_PROJECT_VERSION@'
|
||||
lw_volname = 'Logwolf ' + lw_version
|
||||
lw_volname = 'Logray ' + lw_version
|
||||
lw_srcdir = '@CMAKE_SOURCE_DIR@'
|
||||
lw_bindir = '@CMAKE_BINARY_DIR@'
|
||||
lw_app = 'Logwolf.app'
|
||||
lw_app = 'Logray.app'
|
||||
lw_readme = 'Read me first.html'
|
||||
lw_install_chmodbpf = 'Install ChmodBPF.pkg'
|
||||
lw_uninstall_chmodbpf = 'Uninstall ChmodBPF.pkg'
|
||||
lw_install_path_helper = 'Add Logwolf to the system path.pkg'
|
||||
lw_uninstall_path_helper = 'Remove Logwolf from the system path.pkg'
|
||||
lw_install_path_helper = 'Add Logray to the system path.pkg'
|
||||
lw_uninstall_path_helper = 'Remove Logray from the system path.pkg'
|
||||
|
||||
# .. Basics ....................................................................
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ lw_uninstall_path_helper = 'Remove Logwolf from the system path.pkg'
|
|||
# filename = lw_volname + ' Intel 64.dmg'
|
||||
|
||||
# Uncomment to override the output volume name
|
||||
# volume_name = 'Logwolf ' + lw_version
|
||||
# volume_name = 'Logray ' + lw_version
|
||||
|
||||
# From the hdiutil man page:
|
||||
# UDZO - UDIF zlib-compressed image
|
||||
|
|
@ -55,7 +55,7 @@ size = None
|
|||
# Files to include
|
||||
files = [
|
||||
os.path.join(lw_bindir, 'run', lw_app),
|
||||
os.path.join(lw_bindir, 'packaging', 'macosx', 'logwolf', lw_readme),
|
||||
os.path.join(lw_bindir, 'packaging', 'macosx', 'logray', lw_readme),
|
||||
]
|
||||
|
||||
# Symlinks to create
|
||||
|
|
@ -19,10 +19,10 @@ import os.path
|
|||
# .. Useful stuff ..............................................................
|
||||
|
||||
lw_version = '@LOG_PROJECT_VERSION@'
|
||||
lw_volname = 'Logwolf Debugging Symbols' + lw_version
|
||||
lw_volname = 'Logray Debugging Symbols' + lw_version
|
||||
lw_srcdir = '@CMAKE_SOURCE_DIR@'
|
||||
lw_bindir = '@CMAKE_BINARY_DIR@'
|
||||
lw_app_dsym = 'Logwolf.dSYM'
|
||||
lw_app_dsym = 'Logray.dSYM'
|
||||
lw_readme_dsym = 'Debugging symbols installation.html'
|
||||
|
||||
# .. Basics ....................................................................
|
||||
|
|
@ -31,7 +31,7 @@ lw_readme_dsym = 'Debugging symbols installation.html'
|
|||
# filename = lw_volname + ' Intel 64.dmg'
|
||||
|
||||
# Uncomment to override the output volume name
|
||||
# volume_name = 'Logwolf ' + lw_version
|
||||
# volume_name = 'Logray ' + lw_version
|
||||
|
||||
# From the hdiutil man page:
|
||||
# UDZO - UDIF zlib-compressed image
|
||||
|
|
@ -50,7 +50,7 @@ size = None
|
|||
# Files to include
|
||||
files = [
|
||||
os.path.join(lw_bindir, 'run', lw_app_dsym),
|
||||
os.path.join(lw_bindir, 'packaging', 'macosx', 'logwolf', lw_readme_dsym),
|
||||
os.path.join(lw_bindir, 'packaging', 'macosx', 'logray', lw_readme_dsym),
|
||||
]
|
||||
|
||||
# Symlinks to create
|
||||
|
|
@ -72,7 +72,7 @@ OPTIONS
|
|||
/usr/local.
|
||||
|
||||
EXAMPLE
|
||||
$0 -b Logwolf.app -s -l /opt/local
|
||||
$0 -b Logray.app -s -l /opt/local
|
||||
"
|
||||
}
|
||||
|
||||
|
|
@ -257,7 +257,7 @@ fi
|
|||
"@QT_MACDEPLOYQT_EXECUTABLE@" "$bundle" -no-strip -verbose=2 || exit 1
|
||||
|
||||
#
|
||||
# The build process added to the Wireshark/Logwolf binary an rpath
|
||||
# The build process added to the Wireshark/Logray binary an rpath
|
||||
# entry pointing to the directory containing the Qt frameworks; remove
|
||||
# that entry from the binary in the package.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -67,8 +67,8 @@ fi
|
|||
|
||||
if [[ $app_name = Log* ]] ; then
|
||||
version=$log_version
|
||||
app_settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/logwolf-app.dmgbuild"
|
||||
dsym_settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/logwolf-dsym.dmgbuild"
|
||||
app_settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/logray-app.dmgbuild"
|
||||
dsym_settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/logray-dsym.dmgbuild"
|
||||
fi
|
||||
|
||||
app_vol_name="$app_name ${version}"
|
||||
|
|
|
|||
|
|
@ -30,23 +30,23 @@ set(WIRESHARK_NSIS_FILES
|
|||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
set(LOGWOLF_NSIS_GENERATED_FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/logwolf-manifest.nsh
|
||||
${CMAKE_CURRENT_BINARY_DIR}/logwolf-config.nsh
|
||||
${CMAKE_CURRENT_BINARY_DIR}/logwolf-qt-manifest.nsh
|
||||
set(LOGRAY_NSIS_GENERATED_FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/logray-manifest.nsh
|
||||
${CMAKE_CURRENT_BINARY_DIR}/logray-config.nsh
|
||||
${CMAKE_CURRENT_BINARY_DIR}/logray-qt-manifest.nsh
|
||||
)
|
||||
set(LOGWOLF_NSIS_GENERATED_FILES ${LOGWOLF_NSIS_GENERATED_FILES} PARENT_SCOPE)
|
||||
set(LOGRAY_NSIS_GENERATED_FILES ${LOGRAY_NSIS_GENERATED_FILES} PARENT_SCOPE)
|
||||
|
||||
set(LOGWOLF_NSIS_FILES
|
||||
logwolf.nsi
|
||||
uninstall-logwolf.nsi
|
||||
logwolf-common.nsh
|
||||
set(LOGRAY_NSIS_FILES
|
||||
logray.nsi
|
||||
uninstall-logray.nsi
|
||||
logray-common.nsh
|
||||
GetWindowsVersion.nsh
|
||||
servicelib.nsh
|
||||
AdditionalTasksPage.ini
|
||||
NpcapPage.ini
|
||||
USBPcapPage.ini
|
||||
${LOGWOLF_NSIS_GENERATED_FILES}
|
||||
${LOGRAY_NSIS_GENERATED_FILES}
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ set (LOG_PRODUCT_VERSION ${LOG_PROJECT_MAJOR_VERSION}.${LOG_PROJECT_MINOR_VERSIO
|
|||
# wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
|
||||
#)
|
||||
|
||||
if((BUILD_wireshark OR BUILD_logwolf) AND QT_FOUND)
|
||||
if((BUILD_wireshark OR BUILD_logray) AND QT_FOUND)
|
||||
set (QT_DIR "\${STAGING_DIR}")
|
||||
endif()
|
||||
|
||||
|
|
@ -188,18 +188,18 @@ if (BUILD_wireshark)
|
|||
file(WRITE "${_all_manifest}" "${_all_manifest_contents}")
|
||||
endif()
|
||||
|
||||
if (BUILD_logwolf)
|
||||
if (BUILD_logray)
|
||||
# Ideally we would generate this at compile time using a separate cmake
|
||||
# module, e.g. cmake/modules/configure_nsis_file.cmake. However we would
|
||||
# have to figure out a clean way to pass in the variables above.
|
||||
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/logwolf-config.nsh.in" _config_nsh_contents)
|
||||
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/logray-config.nsh.in" _config_nsh_contents)
|
||||
string(CONFIGURE "${_config_nsh_contents}" _config_nsh_contents)
|
||||
string(REPLACE "#define" "!define" _config_nsh_contents "${_config_nsh_contents}")
|
||||
string(REPLACE "#undef" "!undef" _config_nsh_contents "${_config_nsh_contents}")
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/logwolf-config.nsh" "${_config_nsh_contents}")
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/logray-config.nsh" "${_config_nsh_contents}")
|
||||
|
||||
# logwolf-manifest.nsh. Can be created at configure time.
|
||||
set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/logwolf-manifest.nsh")
|
||||
# logray-manifest.nsh. Can be created at configure time.
|
||||
set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/logray-manifest.nsh")
|
||||
set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n")
|
||||
set(_all_manifest_contents "${_all_manifest_contents}!ifdef BUNDLE_DEBUG_DLLS\n")
|
||||
foreach(_dll ${GLIB2_DLLS_DEBUG})
|
||||
|
|
@ -265,14 +265,14 @@ macro( ADD_NSIS_UNINSTALLER_TARGETS )
|
|||
message(WARNING "The NSIS installer cannot be built if the Wireshark program isn't built.")
|
||||
endif()
|
||||
|
||||
if(BUILD_logwolf)
|
||||
add_custom_command(OUTPUT ${DATAFILE_DIR}/uninstall-logwolf.exe
|
||||
DEPENDS ${_nsis_source_dir}/uninstall-logwolf.nsi
|
||||
${_nsis_source_dir}/logwolf-common.nsh
|
||||
if(BUILD_logray)
|
||||
add_custom_command(OUTPUT ${DATAFILE_DIR}/uninstall-logray.exe
|
||||
DEPENDS ${_nsis_source_dir}/uninstall-logray.nsi
|
||||
${_nsis_source_dir}/logray-common.nsh
|
||||
COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS}
|
||||
uninstall-logwolf.nsi
|
||||
COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/makeUninstall.ps1" ${DATAFILE_DIR}/uninstall_logwolf_installer.exe
|
||||
COMMAND ${CMAKE_COMMAND} -E remove ${DATAFILE_DIR}/uninstall_logwolf_installer.exe
|
||||
uninstall-logray.nsi
|
||||
COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/makeUninstall.ps1" ${DATAFILE_DIR}/uninstall_logray_installer.exe
|
||||
COMMAND ${CMAKE_COMMAND} -E remove ${DATAFILE_DIR}/uninstall_logray_installer.exe
|
||||
WORKING_DIRECTORY ${_nsis_source_dir}
|
||||
)
|
||||
endif()
|
||||
|
|
@ -331,31 +331,31 @@ macro( ADD_NSIS_PACKAGE_TARGETS )
|
|||
)
|
||||
endif()
|
||||
|
||||
if(BUILD_logwolf)
|
||||
if(BUILD_logray)
|
||||
#set (_nsis_package ${CMAKE_BINARY_DIR}/packaging/nsis/Wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe)
|
||||
|
||||
# logwolf-qt-manifest.nsh. Created using Wireshark.exe.
|
||||
add_custom_command(OUTPUT ${_nsis_binary_dir}/logwolf-qt-manifest.nsh
|
||||
# logray-qt-manifest.nsh. Created using Wireshark.exe.
|
||||
add_custom_command(OUTPUT ${_nsis_binary_dir}/logray-qt-manifest.nsh
|
||||
COMMAND set "PATH=${QT_BIN_PATH};%PATH%"
|
||||
COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/windeployqt-to-nsis.ps1"
|
||||
-Executable $<TARGET_FILE:logwolf>
|
||||
-FilePath ${_nsis_binary_dir}/logwolf-qt-manifest.nsh
|
||||
-Executable $<TARGET_FILE:logray>
|
||||
-FilePath ${_nsis_binary_dir}/logray-qt-manifest.nsh
|
||||
$<$<CONFIG:Debug>:-DebugConfig>
|
||||
DEPENDS "${_nsis_source_dir}/windeployqt-to-nsis.ps1"
|
||||
)
|
||||
|
||||
# Build NSIS package dependencies. We build the package in
|
||||
# two stages so that logwolf_nsis below doesn't trigger
|
||||
# two stages so that logray_nsis below doesn't trigger
|
||||
# any dependencies that might clobber any signed executables.
|
||||
add_custom_target(logwolf_nsis_prep
|
||||
add_custom_target(logray_nsis_prep
|
||||
DEPENDS
|
||||
${LOGWOLF_NSIS_FILES}
|
||||
${LOGRAY_NSIS_FILES}
|
||||
copy_data_files
|
||||
user_guide_html
|
||||
faq_html
|
||||
${DATAFILE_DIR}/uninstall-logwolf.exe
|
||||
${DATAFILE_DIR}/uninstall-logray.exe
|
||||
)
|
||||
set_target_properties(logwolf_nsis_prep PROPERTIES
|
||||
set_target_properties(logray_nsis_prep PROPERTIES
|
||||
FOLDER "Packaging"
|
||||
EXCLUDE_FROM_DEFAULT_BUILD True
|
||||
)
|
||||
|
|
@ -363,13 +363,13 @@ macro( ADD_NSIS_PACKAGE_TARGETS )
|
|||
# Dump the installer into
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis
|
||||
# Note that executables and DLLs *must* be built separately
|
||||
add_custom_target(logwolf_nsis
|
||||
add_custom_target(logray_nsis
|
||||
COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS}
|
||||
$<$<CONFIG:Debug>:/DBUNDLE_DEBUG_DLLS>
|
||||
logwolf.nsi
|
||||
logray.nsi
|
||||
WORKING_DIRECTORY ${_nsis_source_dir}
|
||||
)
|
||||
set_target_properties(logwolf_nsis PROPERTIES
|
||||
set_target_properties(logray_nsis PROPERTIES
|
||||
FOLDER "Packaging"
|
||||
EXCLUDE_FROM_DEFAULT_BUILD True
|
||||
)
|
||||
|
|
@ -384,9 +384,9 @@ set(CLEAN_FILES
|
|||
wireshark-config.nsh
|
||||
wireshark-manifest.nsh
|
||||
wireshark-qt-manifest.nsh
|
||||
${DATAFILE_DIR}/uninstall-logwolf.exe
|
||||
logwolf-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
|
||||
logwolf-config.nsh
|
||||
logwolf-manifest.nsh
|
||||
logwolf-qt-manifest.nsh
|
||||
${DATAFILE_DIR}/uninstall-logray.exe
|
||||
logray-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
|
||||
logray-config.nsh
|
||||
logray-manifest.nsh
|
||||
logray-qt-manifest.nsh
|
||||
)
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ https://coolsoft.altervista.org/nsisdialogdesigner
|
|||
Do not edit manually!
|
||||
-->
|
||||
<Dialog Name="AdditionalTasksPage" Title="Additional Tasks" Subtitle="Create shortcuts and associate file extensions.">
|
||||
<CreateFunctionCustomScript>; Defined in logwolf.nsi
|
||||
<CreateFunctionCustomScript>; Defined in logray.nsi
|
||||
Call InitAdditionalTasksPage</CreateFunctionCustomScript>
|
||||
<Label Name="ExtensionsLabel" Location="22, 151" Size="372, 52" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, ntar, out, pcap, pcapng, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." TabIndex="0" />
|
||||
<CheckBox Name="AssociateExtensionsCheckBox" Location="22, 126" Size="406, 14" Text="Associate trace file extensions with Logwolf" TabIndex="1" />
|
||||
<CheckBox Name="QuickLaunchCheckBox" Location="22, 74" Size="406, 14" Text="Logwolf Quick Launch Icon" TabIndex="2" />
|
||||
<CheckBox Name="DesktopIconCheckBox" Location="22, 54" Size="406, 14" Text="Logwolf Desktop Icon" TabIndex="3" />
|
||||
<CheckBox Name="StartMenuCheckBox" Location="22, 34" Size="406, 14" Text="Logwolf Start Menu Item" TabIndex="4" />
|
||||
<CheckBox Name="AssociateExtensionsCheckBox" Location="22, 126" Size="406, 14" Text="Associate trace file extensions with Logray" TabIndex="1" />
|
||||
<CheckBox Name="QuickLaunchCheckBox" Location="22, 74" Size="406, 14" Text="Logray Quick Launch Icon" TabIndex="2" />
|
||||
<CheckBox Name="DesktopIconCheckBox" Location="22, 54" Size="406, 14" Text="Logray Desktop Icon" TabIndex="3" />
|
||||
<CheckBox Name="StartMenuCheckBox" Location="22, 34" Size="406, 14" Text="Logray Start Menu Item" TabIndex="4" />
|
||||
<Label Name="FileExtensionsLabel" Location="12, 101" Size="426, 14" Text="Associate File Extensions" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="5" />
|
||||
<Label Name="CreateShortcutsLabel" Location="12, 9" Size="426, 14" Text="Create Shortcuts" Font="Microsoft Sans Serif, 8.25pt, style=Bold" TabIndex="6" />
|
||||
</Dialog>
|
||||
|
|
@ -36,19 +36,19 @@ Function fnc_AdditionalTasksPage_Create
|
|||
Pop $hCtl_AdditionalTasksPage_ExtensionsLabel
|
||||
|
||||
; === AssociateExtensionsCheckBox (type: Checkbox) ===
|
||||
${NSD_CreateCheckbox} 14u 78u 267u 9u "Associate log file extensions with Logwolf"
|
||||
${NSD_CreateCheckbox} 14u 78u 267u 9u "Associate log file extensions with Logray"
|
||||
Pop $hCtl_AdditionalTasksPage_AssociateExtensionsCheckBox
|
||||
|
||||
; === QuickLaunchCheckBox (type: Checkbox) ===
|
||||
${NSD_CreateCheckbox} 14u 46u 267u 9u "Logwolf Quick Launch Icon"
|
||||
${NSD_CreateCheckbox} 14u 46u 267u 9u "Logray Quick Launch Icon"
|
||||
Pop $hCtl_AdditionalTasksPage_QuickLaunchCheckBox
|
||||
|
||||
; === DesktopIconCheckBox (type: Checkbox) ===
|
||||
${NSD_CreateCheckbox} 14u 33u 267u 9u "Logwolf Desktop Icon"
|
||||
${NSD_CreateCheckbox} 14u 33u 267u 9u "Logray Desktop Icon"
|
||||
Pop $hCtl_AdditionalTasksPage_DesktopIconCheckBox
|
||||
|
||||
; === StartMenuCheckBox (type: Checkbox) ===
|
||||
${NSD_CreateCheckbox} 14u 21u 267u 9u "Logwolf Start Menu Item"
|
||||
${NSD_CreateCheckbox} 14u 21u 267u 9u "Logray Start Menu Item"
|
||||
Pop $hCtl_AdditionalTasksPage_StartMenuCheckBox
|
||||
|
||||
; === FileExtensionsLabel (type: Label) ===
|
||||
|
|
@ -62,7 +62,7 @@ Function fnc_AdditionalTasksPage_Create
|
|||
SendMessage $hCtl_AdditionalTasksPage_CreateShortcutsLabel ${WM_SETFONT} $hCtl_AdditionalTasksPage_Font1 0
|
||||
|
||||
; CreateFunctionCustomScript
|
||||
; Defined in logwolf.nsi
|
||||
; Defined in logray.nsi
|
||||
Call InitAdditionalTasksPage
|
||||
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ ManifestDPIAware true
|
|||
!addincludedir ${NSIS_INCLUDE_DIR}
|
||||
!endif
|
||||
|
||||
!include "logwolf-config.nsh"
|
||||
!include "logray-config.nsh"
|
||||
|
||||
!define BITS 64
|
||||
|
||||
|
|
@ -28,14 +28,14 @@ Name "${DISPLAY_NAME}"
|
|||
!define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} Log Analyzer"
|
||||
!define PROGRAM_NAME_PATH "${PROGRAM_NAME}.exe"
|
||||
|
||||
!define UNINSTALLER_NAME "uninstall-logwolf.exe"
|
||||
!define UNINSTALLER_NAME "uninstall-logray.exe"
|
||||
|
||||
VIAddVersionKey "ProductName" "${PROGRAM_NAME}"
|
||||
VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!"
|
||||
VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
|
||||
; NSIS handles U+00a9 but not a UTF-8 encoded copyright symbol.
|
||||
VIAddVersionKey "LegalCopyright" "${U+00a9} Gerald Combs and many others"
|
||||
VIAddVersionKey "LegalTrademarks" "Logwolf and the 'wolf' logo are registered trademarks"
|
||||
VIAddVersionKey "LegalTrademarks" "Logray and the 'ray' logo are registered trademarks"
|
||||
VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for ${BITS}-bit Windows"
|
||||
VIAddVersionKey "Language" "English"
|
||||
VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
|
||||
|
|
@ -90,8 +90,8 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
|
|||
; probably don't want to grab JPEG or MP3 files.
|
||||
; ============================================================================
|
||||
|
||||
; Used to add associations between file extensions and Logwolf
|
||||
!define LOGWOLF_ASSOC "logwolf-log-file"
|
||||
; Used to add associations between file extensions and Logray
|
||||
!define LOGRAY_ASSOC "logray-log-file"
|
||||
|
||||
!define FILE_EXTENSION_MARKER "FILE_EXTENSION_MARKER"
|
||||
|
||||
|
|
@ -100,8 +100,8 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
|
|||
Push ".scap"
|
||||
!macroend
|
||||
|
||||
!macro IsLogwolfRunning
|
||||
; See if Logwolf is running
|
||||
!macro IsLograyRunning
|
||||
; See if Logray is running
|
||||
; https://nsis.sourceforge.io/Check_whether_your_application_is_running
|
||||
${Do}
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
;
|
||||
; logwolf.nsi
|
||||
; logray.nsi
|
||||
;
|
||||
|
||||
; Set the compression mechanism first.
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
SetCompressor /SOLID lzma
|
||||
SetCompressorDictSize 64 ; MB
|
||||
|
||||
!include "logwolf-common.nsh"
|
||||
!include "logray-common.nsh"
|
||||
!include 'LogicLib.nsh'
|
||||
!include "StrFunc.nsh"
|
||||
!include "WordFunc.nsh"
|
||||
|
|
@ -54,7 +54,7 @@ Icon "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
|
|||
;!addplugindir ".\Plugins"
|
||||
|
||||
!define MUI_ICON "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
|
||||
BrandingText "Logwolf${U+00ae} Installer"
|
||||
BrandingText "Logray${U+00ae} Installer"
|
||||
|
||||
!define MUI_COMPONENTSPAGE_SMALLDESC
|
||||
!define MUI_FINISHPAGE_NOAUTOCLOSE
|
||||
|
|
@ -69,7 +69,7 @@ BrandingText "Logwolf${U+00ae} Installer"
|
|||
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"
|
||||
!define MUI_FINISHPAGE_SHOWREADME_TEXT "Show News"
|
||||
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
|
||||
; NSIS runs as Administrator and will run Logwolf as Administrator
|
||||
; NSIS runs as Administrator and will run Logray as Administrator
|
||||
; if these are enabled.
|
||||
;!define MUI_FINISHPAGE_RUN "$INSTDIR\${PROGRAM_NAME_PATH}"
|
||||
;!define MUI_FINISHPAGE_RUN_NOTCHECKED
|
||||
|
|
@ -80,7 +80,7 @@ BrandingText "Logwolf${U+00ae} Installer"
|
|||
|
||||
!insertmacro MUI_PAGE_WELCOME
|
||||
|
||||
!define MUI_LICENSEPAGE_TEXT_TOP "Logwolf is distributed under the GNU General Public License."
|
||||
!define MUI_LICENSEPAGE_TEXT_TOP "Logray is distributed under the GNU General Public License."
|
||||
!define MUI_LICENSEPAGE_TEXT_BOTTOM "This is not an end user license agreement (EULA). It is provided here for informational purposes only."
|
||||
!define MUI_LICENSEPAGE_BUTTON "Noted"
|
||||
!insertmacro MUI_PAGE_LICENSE "${STAGING_DIR}\COPYING.txt"
|
||||
|
|
@ -115,7 +115,7 @@ Page custom DisplayAdditionalTasksPage LeaveAdditionalTasksPage
|
|||
; https://nsis.sourceforge.io/Docs/Modern%20UI%202/Readme.html
|
||||
; https://nsis.sourceforge.io/Docs/nsDialogs/Readme.html
|
||||
!ifdef QT_DIR
|
||||
!include "logwolf-additional-tasks.nsdinc"
|
||||
!include "logray-additional-tasks.nsdinc"
|
||||
!endif
|
||||
|
||||
; ============================================================================
|
||||
|
|
@ -225,7 +225,7 @@ Function Associate
|
|||
|
||||
Associate.doRegister:
|
||||
;The extension is not associated to any program, we can do the link
|
||||
WriteRegStr HKCR $EXTENSION "" ${LOGWOLF_ASSOC}
|
||||
WriteRegStr HKCR $EXTENSION "" ${LOGRAY_ASSOC}
|
||||
DetailPrint "Registered file type: $EXTENSION"
|
||||
|
||||
Associate.end:
|
||||
|
|
@ -266,7 +266,7 @@ Function .onInit
|
|||
!if ${WIRESHARK_TARGET_PLATFORM} == "win64"
|
||||
; http://forums.winamp.com/printthread.php?s=16ffcdd04a8c8d52bee90c0cae273ac5&threadid=262873
|
||||
${IfNot} ${RunningX64}
|
||||
MessageBox MB_OK "Logwolf only runs on 64-bit machines." /SD IDOK
|
||||
MessageBox MB_OK "Logray only runs on 64-bit machines." /SD IDOK
|
||||
Abort
|
||||
${EndIf}
|
||||
!endif
|
||||
|
|
@ -301,7 +301,7 @@ lbl_winversion_unsupported:
|
|||
Quit
|
||||
|
||||
lbl_winversion_supported:
|
||||
!insertmacro IsLogwolfRunning
|
||||
!insertmacro IsLograyRunning
|
||||
|
||||
; Default control values.
|
||||
StrCpy $START_MENU_STATE ${BST_CHECKED}
|
||||
|
|
@ -382,7 +382,7 @@ check_wix:
|
|||
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$TMP_PRODUCT_GUID" \
|
||||
"DisplayName"
|
||||
; MessageBox MB_OK|MB_ICONINFORMATION "Reading HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$1 DisplayName = $2"
|
||||
; Look for "Logwolf".
|
||||
; Look for "Logray".
|
||||
StrCmp $WIX_DISPLAYNAME "${PROGRAM_NAME}" wix_found wix_reg_enum_loop
|
||||
|
||||
wix_found:
|
||||
|
|
@ -462,7 +462,7 @@ File "${STAGING_DIR}\libwiretap.dll"
|
|||
File "${STAGING_DIR}\libwireshark.dll"
|
||||
File "${STAGING_DIR}\libwsutil.dll"
|
||||
|
||||
!include logwolf-manifest.nsh
|
||||
!include logray-manifest.nsh
|
||||
|
||||
File "${STAGING_DIR}\COPYING.txt"
|
||||
File "${STAGING_DIR}\NEWS.txt"
|
||||
|
|
@ -474,7 +474,7 @@ File "${STAGING_DIR}\wka"
|
|||
File "${STAGING_DIR}\services"
|
||||
File "${STAGING_DIR}\pdml2html.xsl"
|
||||
File "${STAGING_DIR}\ws.css"
|
||||
;File "${STAGING_DIR}\logwolf.html"
|
||||
;File "${STAGING_DIR}\logray.html"
|
||||
File "${STAGING_DIR}\wireshark-filter.html"
|
||||
File "${STAGING_DIR}\dumpcap.exe"
|
||||
File "${STAGING_DIR}\dumpcap.html"
|
||||
|
|
@ -835,7 +835,7 @@ WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayName" "${DISPLAY_NAME
|
|||
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}"
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "HelpLink" "https://ask.wireshark.org/"
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "InstallLocation" "$INSTDIR"
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Publisher" "The Logwolf developer community, https://www.wireshark.org"
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Publisher" "The Logray developer community, https://www.wireshark.org"
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLInfoAbout" "https://www.wireshark.org"
|
||||
WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLUpdateInfo" "https://www.wireshark.org/download.html"
|
||||
|
||||
|
|
@ -854,9 +854,9 @@ Delete "$SMPROGRAMS\${PROGRAM_NAME}\Wireshark Web Site.lnk"
|
|||
; Create file extensions if the Associated Tasks page check box
|
||||
; is checked.
|
||||
${If} $FILE_ASSOCIATE_STATE == ${BST_CHECKED}
|
||||
WriteRegStr HKCR ${LOGWOLF_ASSOC} "" "Logwolf log file"
|
||||
WriteRegStr HKCR "${LOGWOLF_ASSOC}\Shell\open\command" "" '"$INSTDIR\${PROGRAM_NAME_PATH}" "%1"'
|
||||
WriteRegStr HKCR "${LOGWOLF_ASSOC}\DefaultIcon" "" '"$INSTDIR\${PROGRAM_NAME_PATH}",1'
|
||||
WriteRegStr HKCR ${LOGRAY_ASSOC} "" "Logray log file"
|
||||
WriteRegStr HKCR "${LOGRAY_ASSOC}\Shell\open\command" "" '"$INSTDIR\${PROGRAM_NAME_PATH}" "%1"'
|
||||
WriteRegStr HKCR "${LOGRAY_ASSOC}\DefaultIcon" "" '"$INSTDIR\${PROGRAM_NAME_PATH}",1'
|
||||
; We refresh the icon cache down in -Finally.
|
||||
Call Associate
|
||||
; If you add something here be sure to sync it with the uninstall section and the
|
||||
|
|
@ -866,15 +866,15 @@ ${Endif}
|
|||