diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/wix/DirectoryStructure.wxi | 2 |
3 files changed, 7 insertions, 5 deletions
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"> |