diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-07-08 22:43:48 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-08 22:43:48 -0700 |
| commit | 9bbbec6114d8b28ba760786a39ef21c662301621 (patch) | |
| tree | 6fe465405646ea644befefb29c4165c6b5d2e309 /Tools/msi/bundle | |
| parent | 3f25693b02ebad0ef410a713fed23afb8ae6c32f (diff) | |
| download | cpython-9bbbec6114d8b28ba760786a39ef21c662301621.tar.gz | |
Fixes installer rebuild, snapshot versioning, and the README.txt file.
Diffstat (limited to 'Tools/msi/bundle')
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 1 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.targets | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 728355930a..2166304137 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -291,6 +291,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { hr = BalGetStringVariable(L"TargetDir", &targetDir); if (FAILED(hr) || !targetDir || !targetDir[0]) { ReleaseStr(targetDir); + targetDir = nullptr; hr = BalGetStringVariable( installAllUsers ? L"DefaultAllUsersTargetDir" : L"DefaultJustForMeTargetDir", diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index 363c4e3efa..1ff00015b9 100644 --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -72,8 +72,18 @@ <Package Include="..\tools\tools*.wixproj" /> </ItemGroup> + <PropertyGroup> + <BuildPackagesTargets>Build</BuildPackagesTargets> + </PropertyGroup> + + <Target Name="_SetRebuildTarget" BeforeTargets="BeforeRebuild"> + <PropertyGroup> + <BuildPackagesTargets>Rebuild</BuildPackagesTargets> + </PropertyGroup> + </Target> + <Target Name="BuildPackages" BeforeTargets="BeforeBuild" Condition="'$(RebuildAll)' != 'false'"> - <MSBuild Projects="@(Package)" BuildInParallel="true" /> + <MSBuild Projects="@(Package)" Targets="$(BuildPackagesTargets)" BuildInParallel="true" /> </Target> <Target Name="BuildLauncher" BeforeTargets="BeforeBuild" Condition="'$(RebuildAll)' != 'false'"> |