diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-24 23:07:13 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-24 21:11:54 +0000 |
| commit | 181d9b1d26728a75a5e999571e7cec1e28ef1d34 (patch) | |
| tree | 3603d62ac138d7036711fb6d0e6ed6434ed3369d /packaging/wix | |
| parent | 1f3e36534175853a3c4849d60396bf67dd1f46ce (diff) | |
Windows: fix NSIS and WiX installers
Change-Id: I10f21de6ee9cf403690c66d02cbbd43ebb9d52bc
Reviewed-on: https://code.wireshark.org/review/23689
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'packaging/wix')
| -rw-r--r-- | packaging/wix/Plugins.wxi | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi index 2bf2718fbc..606647e5d9 100644 --- a/packaging/wix/Plugins.wxi +++ b/packaging/wix/Plugins.wxi @@ -5,37 +5,37 @@ <Fragment> <DirectoryRef Id="dirPluginsVersion"> <Component Id="cmpDocsis_dll" Guid="*"> - <File Id="filDocsis_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\docsis.dll" /> + <File Id="filDocsis_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\docsis.dll" /> </Component> <Component Id="cmpEthercat_dll" Guid="*"> - <File Id="filEthercat_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\ethercat.dll" /> + <File Id="filEthercat_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\ethercat.dll" /> </Component> <Component Id="cmpGryphon_dll" Guid="*"> - <File Id="filGryphon_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\gryphon.dll" /> + <File Id="filGryphon_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\gryphon.dll" /> </Component> <Component Id="cmpIrda_dll" Guid="*"> - <File Id="filIrda_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\irda.dll" /> + <File Id="filIrda_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\irda.dll" /> </Component> <Component Id="cmpM2m_dll" Guid="*"> - <File Id="filM2m_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\m2m.dll" /> + <File Id="filM2m_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\m2m.dll" /> </Component> <Component Id="cmpOpcua_dll" Guid="*"> - <File Id="filOpcua_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\opcua.dll" /> + <File Id="filOpcua_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\opcua.dll" /> </Component> <Component Id="cmpProfinet_dll" Guid="*"> - <File Id="filProfinet_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\profinet.dll" /> + <File Id="filProfinet_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\profinet.dll" /> </Component> <Component Id="cmpUnistim_dll" Guid="*"> - <File Id="filUnistim_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\unistim.dll" /> + <File Id="filUnistim_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\unistim.dll" /> </Component> <Component Id="cmpWimax_dll" Guid="*"> - <File Id="filWimax_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\wimax.dll" /> + <File Id="filWimax_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\wimax.dll" /> </Component> <Component Id="cmpWimaxasmcp_dll" Guid="*"> - <File Id="filWimaxasmcp_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\wimaxasncp.dll" /> + <File Id="filWimaxasmcp_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\wimaxasncp.dll" /> </Component> <Component Id="cmpWimaxmacphy_dll" Guid="*"> - <File Id="filWimaxmacphy_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\wimaxmacphy.dll" /> + <File Id="filWimaxmacphy_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\wimaxmacphy.dll" /> </Component> <!-- Add custom plugin Components here --> </DirectoryRef> @@ -61,7 +61,7 @@ <Fragment> <DirectoryRef Id="dirPluginsVersion"> <Component Id="cmpStatsTree_dll" Guid="*"> - <File Id="filStatsTree_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\stats_tree.dll" /> + <File Id="filStatsTree_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\stats_tree.dll" /> </Component> </DirectoryRef> </Fragment> @@ -75,7 +75,7 @@ <Fragment> <DirectoryRef Id="dirPluginsVersion"> <Component Id="cmpMate_dll" Guid="*"> - <File Id="filMate_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\mate.dll" /> + <File Id="filMate_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\mate.dll" /> </Component> </DirectoryRef> </Fragment> @@ -89,7 +89,7 @@ <Fragment> <DirectoryRef Id="dirPluginsVersion"> <Component Id="cmpTransum_dll" Guid="*"> - <File Id="filTransum_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\transum.dll" /> + <File Id="filTransum_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\transum.dll" /> </Component> </DirectoryRef> </Fragment> |