diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-12-19 12:40:21 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-12-19 22:58:43 +0000 |
| commit | 175951f0f305360fc46b326256fe2b8cac2b50ab (patch) | |
| tree | 8d4c4ce0724f139231de9a168ffd9caa18c2883e /packaging | |
| parent | b8a4843db5a683e7a15d4c049371a526f87e1716 (diff) | |
WiX: Build packages verbosely.
Pass the `-v` flag to candle, light, and heat.
Remove a couple of apparently unused and definitely misleading variables.
Change-Id: If3c50f3f1596f244e8354b77bbd443779f5aa981
Reviewed-on: https://code.wireshark.org/review/31132
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/wix/InputPaths.wxi | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index ec4bf067d7..a38d483663 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -172,6 +172,7 @@ if (MAXMINDDB_FOUND) endif() set(WIX_CANDLE_DEFINES + -v -sw1076 -dPlatform=${TARGET_MACHINE} -dWiresharkName=${CMAKE_PROJECT_NAME} @@ -198,6 +199,7 @@ set(WIX_CANDLE_DEFINES # The NSIS CMakeFile sets the program name + version slightly differently. set(WIX_LIGHT_DEFINES + -v -out ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${WIRESHARK_TARGET_PLATFORM}-${PROJECT_VERSION}.msi -sw1076 -ext WixUIExtension @@ -206,6 +208,7 @@ set(WIX_LIGHT_DEFINES ) set(WIX_HEAT_FLAGS + -v -ag -nologo -srd diff --git a/packaging/wix/InputPaths.wxi b/packaging/wix/InputPaths.wxi index 8ae31b6689..0fae77b721 100644 --- a/packaging/wix/InputPaths.wxi +++ b/packaging/wix/InputPaths.wxi @@ -7,9 +7,6 @@ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> <?endif?> - <?define VCRedist.Version = "VC141" ?> - <?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" ?> |