Wireshark-commits: [Wireshark-commits] master cec99ab: Win32: Restore the versioned plugin installa
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cec99abac97a583959cee07bb8826a7b8eda61e2
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
cec99ab by Gerald Combs (gerald@xxxxxxxxxxxxx):
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@xxxxxxxxx>
Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 461666b Qt: fix maximized state apply
adds cec99ab Win32: Restore the versioned plugin installation path.
Summary of changes:
packaging/nsis/wireshark.nsi | 6 +++---
wsutil/filesystem.c | 25 ++++++++++++++++++++++++-
2 files changed, 27 insertions(+), 4 deletions(-)