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/wix | |
| 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/wix')
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/wix/DirectoryStructure.wxi | 2 |
2 files changed, 3 insertions, 1 deletions
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"> |