traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 3.5

This commit is contained in:
Steve Dower 2015-10-11 18:05:27 -07:00
parent 3628d488c7 8ffe4fdeb0
commit 79e60dec1b
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/msi/bundle/Default.wxl
View File

@ -52,7 +52,7 @@ Creates shortcuts and file associations</String>
<String Id="InstallSimpleButtonNote">Use settings preselected by your administrator
[SimpleInstallDescription]</String>
<String Id="InstallUpgradeButton">&amp;Upgrade Now</String>
<String Id="InstallUpgradeButton">Up&amp;grade Now</String>
<String Id="InstallUpgradeButtonNote">[TargetDir]
Replaces your existing installation without changing settings.

16
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View File

@ -674,6 +674,8 @@ public: // IBootstrapperApplication
hr
);
}
LoadOptionalFeatureStates(_engine);
} else if (BOOTSTRAPPER_RELATED_OPERATION_NONE == operation) {
if (_command.action == BOOTSTRAPPER_ACTION_INSTALL) {
LOC_STRING *pLocString = nullptr;
@ -2556,7 +2558,14 @@ private:
BOOL WillElevate() {
static BAL_CONDITION WILL_ELEVATE_CONDITION = {
L"not WixBundleElevated and (InstallAllUsers or (InstallLauncherAllUsers and Include_launcher))",
L"not WixBundleElevated and ("
/*Elevate when installing for all users*/
L"InstallAllUsers or"
/*Elevate when installing the launcher for all users and it was not detected*/
L"(InstallLauncherAllUsers and Include_launcher and not DetectedLauncher) or"
/*Elevate when the launcher was installed for all users and it is being removed*/
L"(DetectedLauncher and DetectedLauncherAllUsers and not Include_launcher)"
L")",
L""
};
BOOL result;
@ -2884,6 +2893,10 @@ private:
pEngine->SetVariableNumeric(L"Include_launcher", 0);
} else if (res == ERROR_SUCCESS) {
pEngine->SetVariableNumeric(L"Include_launcher", 1);
pEngine->SetVariableNumeric(L"DetectedLauncher", 1);
pEngine->SetVariableNumeric(L"InstallLauncherAllUsers", (hkHive == HKEY_LOCAL_MACHINE) ? 1 : 0);
pEngine->SetVariableNumeric(L"DetectedLauncherAllUsers", (hkHive == HKEY_LOCAL_MACHINE) ? 1 : 0);
pEngine->SetVariableString(L"InstallLauncherAllUsersState", L"disable");
}
res = RegQueryValueExW(hKey, L"AssociateFiles", nullptr, nullptr, nullptr, nullptr);
@ -3101,7 +3114,6 @@ public:
_hBAFModule = nullptr;
_baFunction = nullptr;
LoadOptionalFeatureStates(pEngine);
EnsureTargetDir();
}

1
Tools/msi/bundle/bundle.wxs
View File

@ -65,6 +65,7 @@
<Variable Name="Include_debug" Value="0" bal:Overridable="yes" />
<Variable Name="LauncherOnly" Value="0" bal:Overridable="yes" />
<Variable Name="DetectedLauncher" Value="0" />
<Variable Name="AssociateFiles" Value="1" bal:Overridable="yes" />
<Variable Name="Shortcuts" Value="1" bal:Overridable="yes" />