diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-07 11:56:36 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-07 23:01:40 +0000 |
| commit | cec99abac97a583959cee07bb8826a7b8eda61e2 (patch) | |
| tree | fa26f82a366ebf8e0f0c8089d2c4fca1fb01419a /packaging/nsis | |
| parent | 461666bcd1aacc8f360fca76129fe4a545819fc9 (diff) | |
| download | wireshark-cec99abac97a583959cee07bb8826a7b8eda61e2.tar.gz | |
Win32: Restore the versioned plugin installation path.
Revert parts of g2ef72cb and g7710da4 so that the NSIS installer once
again places plugins in $INSTDIR\plugins\$VERSION. This matches the
behavior of Autotools and previous Windows installers, and reduces the
chances of a version mismatch if the user happens to install a custom
plugin.
Leave the development plugin path unversioned. Leave the extcap path
unversioned for now.
Change-Id: I861d4ee12975fba4b642e391871c5e852d92a2fe
Reviewed-on: https://code.wireshark.org/review/7976
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index e24bb2e7e3..69d67af095 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -888,7 +888,7 @@ SectionGroup "Plugins & Extensions" SecPluginsGroup Section "Dissector Plugins" SecPlugins ;------------------------------------------- -SetOutPath '$INSTDIR\plugins' +SetOutPath '$INSTDIR\plugins\${VERSION}' File "${STAGING_DIR}\plugins\docsis.dll" File "${STAGING_DIR}\plugins\ethercat.dll" File "${STAGING_DIR}\plugins\gryphon.dll" @@ -905,13 +905,13 @@ SectionEnd Section "Tree Statistics Plugin" SecStatsTree ;------------------------------------------- -SetOutPath '$INSTDIR\plugins' +SetOutPath '$INSTDIR\plugins\${VERSION}' File "${STAGING_DIR}\plugins\stats_tree.dll" SectionEnd Section "Mate - Meta Analysis and Tracing Engine" SecMate ;------------------------------------------- -SetOutPath '$INSTDIR\plugins' +SetOutPath '$INSTDIR\plugins\${VERSION}' File "${STAGING_DIR}\plugins\mate.dll" SectionEnd |