diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-22 19:13:33 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-09-23 17:49:08 +0000 |
| commit | fd4dc6f115868f18e787f4bffaf8f8c5ceccff82 (patch) | |
| tree | 2d3227bf7637108fae61400b43f15041554808d4 /packaging/nsis | |
| parent | caa9b19107a097a64552e5fc071f4d7fd218b59e (diff) | |
plugins: Fixups for g9260461f4f
Put plugins in CMake build dir with a version subdir. This avoids some
weird special cases, however running with autotools from build dir
displays the wrong global folder in about->folders. Unfortunately
the hack to run from the autotools build dir is troublesome.
Various fixes for Windows builds.
Try to fix also build dir issue loading plugins on macOS with
ENABLE_APPLICATION_BUNDLE (blind).
Change-Id: Ic3c7c21f5850c12a53844202d61fa0592b45739c
Reviewed-on: https://code.wireshark.org/review/23657
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 |
1 files changed, 4 insertions, 4 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 |