diff options
| author | Nir Bar <nir.bar@panel-sw.co.il> | 2023-06-05 13:27:56 +0300 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2024-01-20 22:27:41 -0500 |
| commit | dfea4478a4938ce738fd49282350d36c73fb9a35 (patch) | |
| tree | 8445e774b7a79a76f239ed523c6689f445961da2 /src/burn/engine/logging.cpp | |
| parent | cde596e1bb9288f8cebb447a5f8cb79ca684cfe1 (diff) | |
| download | wix-dfea4478a4938ce738fd49282350d36c73fb9a35.tar.gz wix-dfea4478a4938ce738fd49282350d36c73fb9a35.tar.bz2 wix-dfea4478a4938ce738fd49282350d36c73fb9a35.zip | |
Fixes wixtoolset/issues#5220: Automatically add logging flag for any burn ExePackage, BundlePackage, and related bundles
Diffstat (limited to 'src/burn/engine/logging.cpp')
| -rw-r--r-- | src/burn/engine/logging.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/burn/engine/logging.cpp b/src/burn/engine/logging.cpp index a16e82b0..630598ae 100644 --- a/src/burn/engine/logging.cpp +++ b/src/burn/engine/logging.cpp | |||
| @@ -325,6 +325,19 @@ extern "C" HRESULT LoggingSetPackageVariable( | |||
| 325 | ExitFunction(); | 325 | ExitFunction(); |
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | // For burn packages we'll add logging even it it wasn't explictly specified | ||
| 329 | if (BURN_PACKAGE_TYPE_BUNDLE == pPackage->type || (BURN_PACKAGE_TYPE_EXE == pPackage->type && BURN_EXE_PROTOCOL_TYPE_BURN == pPackage->Exe.protocol)) | ||
| 330 | { | ||
| 331 | if (!fRollback && (!pPackage->sczLogPathVariable || !*pPackage->sczLogPathVariable)) | ||
| 332 | { | ||
| 333 | StrAllocFormatted(&pPackage->sczLogPathVariable, L"WixBundleLog_%ls", pPackage->sczId); | ||
| 334 | } | ||
| 335 | else if (fRollback && (!pPackage->sczRollbackLogPathVariable || !*pPackage->sczRollbackLogPathVariable)) | ||
| 336 | { | ||
| 337 | StrAllocFormatted(&pPackage->sczRollbackLogPathVariable, L"WixBundleRollbackLog_%ls", pPackage->sczId); | ||
| 338 | } | ||
| 339 | } | ||
| 340 | |||
| 328 | if ((!fRollback && pPackage->sczLogPathVariable && *pPackage->sczLogPathVariable) || | 341 | if ((!fRollback && pPackage->sczLogPathVariable && *pPackage->sczLogPathVariable) || |
| 329 | (fRollback && pPackage->sczRollbackLogPathVariable && *pPackage->sczRollbackLogPathVariable)) | 342 | (fRollback && pPackage->sczRollbackLogPathVariable && *pPackage->sczRollbackLogPathVariable)) |
| 330 | { | 343 | { |
