diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-03-16 15:20:15 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-03-16 20:14:37 -0500 |
| commit | 8c9ca787bee29f969cd7ca9aeaa46626d557d196 (patch) | |
| tree | 8a7278a4035b584e1f1585e3215766af3ca0a62b /src/burn/engine/core.cpp | |
| parent | c1694843f7c54c7f9feb3f7074a31ff8499c9644 (diff) | |
| download | wix-8c9ca787bee29f969cd7ca9aeaa46626d557d196.tar.gz wix-8c9ca787bee29f969cd7ca9aeaa46626d557d196.tar.bz2 wix-8c9ca787bee29f969cd7ca9aeaa46626d557d196.zip | |
Add WixBundleCommandLineAction, don't set dynamic variables at startup.
Fixes 6736
Diffstat (limited to 'src/burn/engine/core.cpp')
| -rw-r--r-- | src/burn/engine/core.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index 37872e52..becece86 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
| @@ -309,7 +309,7 @@ extern "C" HRESULT CoreDetect( | |||
| 309 | pEngineState->fDetected = FALSE; | 309 | pEngineState->fDetected = FALSE; |
| 310 | pEngineState->fPlanned = FALSE; | 310 | pEngineState->fPlanned = FALSE; |
| 311 | DetectReset(&pEngineState->registration, &pEngineState->packages); | 311 | DetectReset(&pEngineState->registration, &pEngineState->packages); |
| 312 | PlanReset(&pEngineState->plan, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); | 312 | PlanReset(&pEngineState->plan, &pEngineState->variables, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); |
| 313 | 313 | ||
| 314 | hr = RegistrationSetDynamicVariables(&pEngineState->registration, &pEngineState->variables); | 314 | hr = RegistrationSetDynamicVariables(&pEngineState->registration, &pEngineState->variables); |
| 315 | ExitOnFailure(hr, "Failed to reset the dynamic registration variables during detect."); | 315 | ExitOnFailure(hr, "Failed to reset the dynamic registration variables during detect."); |
| @@ -441,6 +441,9 @@ extern "C" HRESULT CorePlan( | |||
| 441 | BURN_PACKAGE* pForwardCompatibleBundlePackage = NULL; | 441 | BURN_PACKAGE* pForwardCompatibleBundlePackage = NULL; |
| 442 | BOOL fContinuePlanning = TRUE; // assume we won't skip planning due to dependencies. | 442 | BOOL fContinuePlanning = TRUE; // assume we won't skip planning due to dependencies. |
| 443 | 443 | ||
| 444 | hr = PlanSetVariables(action, &pEngineState->variables); | ||
| 445 | ExitOnFailure(hr, "Failed to update action."); | ||
| 446 | |||
| 444 | LogId(REPORT_STANDARD, MSG_PLAN_BEGIN, pEngineState->packages.cPackages, LoggingBurnActionToString(action)); | 447 | LogId(REPORT_STANDARD, MSG_PLAN_BEGIN, pEngineState->packages.cPackages, LoggingBurnActionToString(action)); |
| 445 | 448 | ||
| 446 | fPlanBegan = TRUE; | 449 | fPlanBegan = TRUE; |
| @@ -458,7 +461,7 @@ extern "C" HRESULT CorePlan( | |||
| 458 | 461 | ||
| 459 | // Always reset the plan. | 462 | // Always reset the plan. |
| 460 | pEngineState->fPlanned = FALSE; | 463 | pEngineState->fPlanned = FALSE; |
| 461 | PlanReset(&pEngineState->plan, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); | 464 | PlanReset(&pEngineState->plan, &pEngineState->variables, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); |
| 462 | 465 | ||
| 463 | // Remember the overall action state in the plan since it shapes the changes | 466 | // Remember the overall action state in the plan since it shapes the changes |
| 464 | // we make everywhere. | 467 | // we make everywhere. |
| @@ -472,9 +475,6 @@ extern "C" HRESULT CorePlan( | |||
| 472 | pEngineState->plan.fDisableRollback = pEngineState->fDisableRollback || BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == pEngineState->plan.action; | 475 | pEngineState->plan.fDisableRollback = pEngineState->fDisableRollback || BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == pEngineState->plan.action; |
| 473 | pEngineState->plan.fPlanPackageCacheRollback = BOOTSTRAPPER_REGISTRATION_TYPE_NONE == pEngineState->registration.detectedRegistrationType; | 476 | pEngineState->plan.fPlanPackageCacheRollback = BOOTSTRAPPER_REGISTRATION_TYPE_NONE == pEngineState->registration.detectedRegistrationType; |
| 474 | 477 | ||
| 475 | hr = PlanSetVariables(action, &pEngineState->variables); | ||
| 476 | ExitOnFailure(hr, "Failed to update action."); | ||
| 477 | |||
| 478 | // Set resume commandline | 478 | // Set resume commandline |
| 479 | hr = PlanSetResumeCommand(&pEngineState->plan, &pEngineState->registration, &pEngineState->log); | 479 | hr = PlanSetResumeCommand(&pEngineState->plan, &pEngineState->registration, &pEngineState->log); |
| 480 | ExitOnFailure(hr, "Failed to set resume command"); | 480 | ExitOnFailure(hr, "Failed to set resume command"); |