diff options
| author | Bob Arnson <bob@firegiant.com> | 2022-12-21 21:41:03 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2022-12-21 22:42:53 -0500 |
| commit | 6bc32281a99bea30541f77dd0bf9e9658753afdc (patch) | |
| tree | 5a156f9b0720493270c85db1256d69241b2ba255 | |
| parent | bc52de8bd03922cac66b9dddabe14c413d599532 (diff) | |
| download | wix-6bc32281a99bea30541f77dd0bf9e9658753afdc.tar.gz wix-6bc32281a99bea30541f77dd0bf9e9658753afdc.tar.bz2 wix-6bc32281a99bea30541f77dd0bf9e9658753afdc.zip | |
Get "real" Burn version for logging.
Fixes https://github.com/wixtoolset/issues/issues/7082.
| -rw-r--r-- | src/burn/engine/engine.cpp | 2 | ||||
| -rw-r--r-- | src/burn/engine/engine.vcxproj | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp index c9d2bdcd..b093ec9b 100644 --- a/src/burn/engine/engine.cpp +++ b/src/burn/engine/engine.cpp | |||
| @@ -204,7 +204,7 @@ extern "C" HRESULT EngineRun( | |||
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | PathForCurrentProcess(&sczExePath, NULL); // Ignore failure. | 206 | PathForCurrentProcess(&sczExePath, NULL); // Ignore failure. |
| 207 | LogId(REPORT_STANDARD, MSG_BURN_INFO, szVerMajorMinorBuild, ovix.dwMajorVersion, ovix.dwMinorVersion, ovix.dwBuildNumber, ovix.wServicePackMajor, sczExePath, szBurnPlatform, szMachinePlatform); | 207 | LogId(REPORT_STANDARD, MSG_BURN_INFO, szInformationalVersion, ovix.dwMajorVersion, ovix.dwMinorVersion, ovix.dwBuildNumber, ovix.wServicePackMajor, sczExePath, szBurnPlatform, szMachinePlatform); |
| 208 | ReleaseNullStr(sczExePath); | 208 | ReleaseNullStr(sczExePath); |
| 209 | 209 | ||
| 210 | // initialize core | 210 | // initialize core |
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj index ba26f68e..768f20ba 100644 --- a/src/burn/engine/engine.vcxproj +++ b/src/burn/engine/engine.vcxproj | |||
| @@ -162,6 +162,7 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command> | |||
| 162 | <rup>$(GitBaseVersionPatch)</rup> | 162 | <rup>$(GitBaseVersionPatch)</rup> |
| 163 | <rpr>$(GitCommits)</rpr> | 163 | <rpr>$(GitCommits)</rpr> |
| 164 | <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild> | 164 | <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild> |
| 165 | <szInformationalVersion>$(InformationalVersion)</szInformationalVersion> | ||
| 165 | </PropertyGroup> | 166 | </PropertyGroup> |
| 166 | 167 | ||
| 167 | <ItemGroup> | 168 | <ItemGroup> |
| @@ -176,6 +177,8 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command> | |||
| 176 | #define rmm $(rmm) | 177 | #define rmm $(rmm) |
| 177 | #define rup $(rup) | 178 | #define rup $(rup) |
| 178 | #define rpr $(rpr) | 179 | #define rpr $(rpr) |
| 180 | #define szInformationalVersion "$(szInformationalVersion)" | ||
| 181 | #define wzInformationalVersion L"$(szInformationalVersion)" | ||
| 179 | 182 | ||
| 180 | #endif | 183 | #endif |
| 181 | "/> | 184 | "/> |
