diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/modules/WiresharkPlugin.cmake | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/wix/DirectoryStructure.wxi | 2 | ||||
| -rw-r--r-- | wsutil/filesystem.c | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d06049c5a2..e6c0a32e35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1425,13 +1425,12 @@ else() endif() if(ENABLE_APPLICATION_BUNDLE) - set(_plugin_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark") + set(_plugin_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark/${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}") else() get_target_property(_libwireshark_location epan LOCATION) get_filename_component(_plugin_dir "${_libwireshark_location}" PATH) - set(_plugin_dir "${_plugin_dir}/plugins") + set(_plugin_dir "${_plugin_dir}/${PLUGIN_VERSION_DIR}") endif() -# XXX The NMake environment appends the version. Should we do so here? set (PLUGIN_DIR ${_plugin_dir} CACHE INTERNAL "Build time plugin location.") foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS}) diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index 36d1ebfdfb..04b11377f2 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -50,7 +50,7 @@ macro(ADD_PLUGIN_LIBRARY _plugin) foreach(_config_type ${CMAKE_CONFIGURATION_TYPES}) string(TOUPPER ${_config_type} _config_upper) set_target_properties(${_plugin} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY_${_config_upper} ${CMAKE_BINARY_DIR}/run/${_config_type}/plugins + LIBRARY_OUTPUT_DIRECTORY_${_config_upper} ${CMAKE_BINARY_DIR}/run/${_config_type}/${PLUGIN_VERSION_DIR} ) endforeach() diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 03e8a01993..2ee35a7a1b 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1009,7 +1009,7 @@ SectionGroup "Plugins & Extensions" SecPluginsGroup Section "Dissector Plugins" SecPlugins ;------------------------------------------- -SetOutPath '$INSTDIR\plugins\${VERSION}' +SetOutPath '$INSTDIR\plugins\${VERSION_MAJOR}.${VERSION_MINOR}' File "${STAGING_DIR}\plugins\docsis.dll" File "${STAGING_DIR}\plugins\ethercat.dll" File "${STAGING_DIR}\plugins\gryphon.dll" @@ -1026,20 +1026,20 @@ SectionEnd Section "Tree Statistics Plugin" SecStatsTree ;------------------------------------------- -SetOutPath '$INSTDIR\plugins\${VERSION}' +SetOutPath '$INSTDIR\plugins\${VERSION_MAJOR}.${VERSION_MINOR}' File "${STAGING_DIR}\plugins\stats_tree.dll" SectionEnd Section "Mate - Meta Analysis and Tracing Engine" SecMate ;------------------------------------------- -SetOutPath '$INSTDIR\plugins\${VERSION}' +SetOutPath '$INSTDIR\plugins\${VERSION_MAJOR}.${VERSION_MINOR}' File "${STAGING_DIR}\plugins\mate.dll" SectionEnd Section "TRANSUM - network and application performance analysis" SecTransum ;------------------------------------------- -SetOutPath '$INSTDIR\plugins\${VERSION}' +SetOutPath '$INSTDIR\plugins\${VERSION_MAJOR}.${VERSION_MINOR}' File "${STAGING_DIR}\plugins\transum.dll" SectionEnd diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 9efad04503..cc976f3dd5 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -308,6 +308,8 @@ set(WIX_CANDLE_DEFINES -dPlatform=${TARGET_MACHINE} -dWiresharkName=${CMAKE_PROJECT_NAME} -dWiresharkVersion=${PRODUCT_VERSION} + -dWiresharkMajorVersion=${PROJECT_MAJOR_VERSION} + -dWiresharkMinorVersion=${PROJECT_MINOR_VERSION} -dAssetDir=${CMAKE_SOURCE_DIR}/packaging/wix -dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE} -dDiameterDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/diameter diff --git a/packaging/wix/DirectoryStructure.wxi b/packaging/wix/DirectoryStructure.wxi index 6e24e2ce73..00c2dbfb5e 100644 --- a/packaging/wix/DirectoryStructure.wxi +++ b/packaging/wix/DirectoryStructure.wxi @@ -28,7 +28,7 @@ </Directory> <Directory Id="dirRadius" Name="radius"/> <Directory Id="dirPlugins" Name="plugins"> - <Directory Id="dirPluginsVersion" Name="$(var.WiresharkVersion)"/> + <Directory Id="dirPluginsVersion" Name="$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)"/> </Directory> <Directory Id="dirProfiles" Name="profiles"/> <Directory Id="dirSnmp" Name="snmp"> diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index ea4629091b..ce1eca773b 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -975,7 +975,7 @@ init_plugin_dir(void) * on Windows, the data file directory is the directory * in which the Wireshark binary resides. */ - plugin_dir = g_build_filename(get_datafile_dir(), "plugins", VERSION, (gchar *)NULL); + plugin_dir = g_build_filename(get_datafile_dir(), "plugins", (gchar *)NULL); /* * Make sure that pathname refers to a directory. |