Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
a004c54f
Commit
a004c54f
authored
Sep 11, 2015
by
Steve Dower
Browse files
Options
Browse Files
Download
Plain Diff
Issue #25071: Windows installer should not require TargetDir parameter when installing quietly
parents
4d315708
729aa146
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
0 deletions
+46
-0
Misc/NEWS
Misc/NEWS
+16
-0
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+30
-0
No files found.
Misc/NEWS
View file @
a004c54f
...
...
@@ -189,6 +189,22 @@ Build
when
external
libraries
are
not
available
.
Windows
-------
-
Issue
#
25022
:
Removed
very
outdated
PC
/
example_nt
/
directory
.
What
's New in Python 3.5.0 final?
=================================
Release date: 2015-09-13
Build
-----
- Issue #25071: Windows installer should not require TargetDir
parameter when installing quietly
What'
s
New
in
Python
3.5.0
release
candidate
4
?
===============================================
...
...
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file @
a004c54f
...
...
@@ -723,6 +723,36 @@ public: // IBootstrapperApplication
hrStatus
=
EvaluateConditions
();
}
if
(
SUCCEEDED
(
hrStatus
))
{
// Ensure the default path has been set
LONGLONG
installAll
;
LPWSTR
targetDir
=
nullptr
;
LPWSTR
defaultTargetDir
=
nullptr
;
hrStatus
=
BalGetStringVariable
(
L"TargetDir"
,
&
targetDir
);
if
(
FAILED
(
hrStatus
)
||
!
targetDir
||
!
targetDir
[
0
])
{
ReleaseStr
(
targetDir
);
targetDir
=
nullptr
;
if
(
FAILED
(
BalGetNumericVariable
(
L"InstallAllUsers"
,
&
installAll
)))
{
installAll
=
0
;
}
hrStatus
=
BalGetStringVariable
(
installAll
?
L"DefaultAllUsersTargetDir"
:
L"DefaultJustForMeTargetDir"
,
&
defaultTargetDir
);
if
(
SUCCEEDED
(
hrStatus
)
&&
defaultTargetDir
)
{
if
(
defaultTargetDir
[
0
]
&&
SUCCEEDED
(
BalFormatString
(
defaultTargetDir
,
&
targetDir
)))
{
hrStatus
=
_engine
->
SetVariableString
(
L"TargetDir"
,
targetDir
);
ReleaseStr
(
targetDir
);
}
ReleaseStr
(
defaultTargetDir
);
}
}
}
SetState
(
PYBA_STATE_DETECTED
,
hrStatus
);
// If we're not interacting with the user or we're doing a layout or we're just after a force restart
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment