diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-04-07 19:03:51 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-05-11 13:09:17 +0000 |
| commit | c34996f970ab003bb8566825b38834de00f5159e (patch) | |
| tree | fda0c581d87baf3cb0264affaaeb861354f66311 /packaging/wix/InputPaths.wxi | |
| parent | 980f58bc277df178a15b4c730fb1b0cbd462da0b (diff) | |
Create a Wix Installer
This is intended to replace the NSIS installer for Windows.
It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together)
TODO:
1. Customize installer with Wireshark graphics
2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake.
3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns.
4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility.
Many thanks to Brian Pratt for all the Wix help.
Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c
Reviewed-on: https://code.wireshark.org/review/14858
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'packaging/wix/InputPaths.wxi')
| -rw-r--r-- | packaging/wix/InputPaths.wxi | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/packaging/wix/InputPaths.wxi b/packaging/wix/InputPaths.wxi new file mode 100644 index 0000000000..c85863162a --- /dev/null +++ b/packaging/wix/InputPaths.wxi @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<Include> + + <?if $(var.Platform) = x64 ?> + <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?> + <?else?> + <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> + <?endif?> + + <?define VCRedist.Version = "VC120" ?> + <?define VCRedist.Dir ="C:\Program Files (x86)\Common Files\Merge Modules\" ?> + + <?define Staging.Dir ="$(var.BuildOutputDir)" ?> + <?define Plugins.Dir ="$(var.Staging.Dir)\plugins" ?> + <?define Profiles.Dir ="$(var.Staging.Dir)\profiles" ?> + <?define Extcap.Dir ="$(var.Staging.Dir)\extcap" ?> + <?define WiresharkQt.Dir ="$(var.Staging.Dir)" ?> + <?define Dtds.Dir ="$(var.Staging.Dir)\dtds" ?> + <?define Tpncp.Dir ="$(var.Staging.Dir)\tpncp" ?> + <?define Wimaxasncp.Dir ="$(var.Staging.Dir)\wimaxasncp" ?> + <?define Help.Dir ="$(var.Staging.Dir)\help" ?> + <?define Epan.Lua.Dir ="..\..\epan\wslua" ?> + <?define GTK2_0.Dir ="$(var.Staging.Dir)\etc\gtk-2.0" ?> + <?define Lib_GTK2_0_Engines.Dir ="$(var.Staging.Dir)\lib\gtk-2.0\2.10.0\engines" ?> + <?define Lib_GTK2_0_Modules.Dir ="$(var.Staging.Dir)\lib\gtk-2.0\modules" ?> + +</Include> |