diff options
author | Gerald Combs <gerald@wireshark.org> | 2020-01-06 09:58:38 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2020-01-06 19:50:50 +0000 |
commit | 7a09c78f123b5dd1237000726f19e2801edeaf39 (patch) | |
tree | f22a656841a463d52039b352380f5261031d57e9 /packaging/wix | |
parent | 05d772ce7b40008dcb99f492aece86507166c233 (diff) |
NSIS: Don't package .pdb files.
We run `windeployqt ... --pdbs` at build time, which means that we need
to be careful not to include them in the NSIS package. Switch from using
wildcards ("File ...\*") to using separate "File" commands for each file.
Simplify the PDB Zip package command while we're here.
Bug: 16307
Change-Id: Ibd9bcbdfdc216f1f6a067baf711bbc184845143f
Reviewed-on: https://code.wireshark.org/review/35670
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/wix')
-rw-r--r-- | packaging/wix/CMakeLists.txt | 1 | ||||
-rw-r--r-- | packaging/wix/windeployqt-to-wix.ps1 | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index df8070431f..ba89480b62 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -266,6 +266,7 @@ macro( ADD_WIX_PACKAGE_TARGET ) COMMAND ${POWERSHELL_COMMAND} "${_wix_source_dir}/windeployqt-to-wix.ps1" -Executable $<TARGET_FILE:wireshark> -FilePath ${_wix_binary_dir}/QtDependentComponents.wxs + DEPENDS "${_wix_source_dir}/windeployqt-to-wix.ps1" ) # SNMPMibs.wxs. Collects all MIBs in "output" snmp/mibs diff --git a/packaging/wix/windeployqt-to-wix.ps1 b/packaging/wix/windeployqt-to-wix.ps1 index c90b97135a..a16964346f 100644 --- a/packaging/wix/windeployqt-to-wix.ps1 +++ b/packaging/wix/windeployqt-to-wix.ps1 @@ -62,6 +62,9 @@ try { Throw "Qt " + $qtVersion + " found. 5.3 or later is required." } + # windeployqt lists translation files that it don't exist (e.g. + # qtbase_ar.qm), so we handle those by hand. + # https://bugreports.qt.io/browse/QTBUG-65974 $wdqtList = windeployqt ` --release ` --no-compiler-runtime ` |