From 3a0f471e5f14a0b49651bcebc15c721c5c82d28b Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 22 Sep 2015 14:33:31 -0700 Subject: Issue #25213: Restores requestedExecutionLevel to manifest to disable UAC virtualization. --- Misc/NEWS | 3 +++ PC/python.manifest | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 350c3c2..882e310 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -147,6 +147,9 @@ Build Windows ------- +- Issue #25213: Restores requestedExecutionLevel to manifest to disable + UAC virtualization. + - Issue #25022: Removed very outdated PC/example_nt/ directory. What's New in Python 3.5.0 final? diff --git a/PC/python.manifest b/PC/python.manifest index 3ac2630..9b7b2f8 100644 --- a/PC/python.manifest +++ b/PC/python.manifest @@ -1,5 +1,12 @@ + + + + + + + -- cgit v0.12 From 57ab1cdb152bdb223555ca2f46de06e3e26485dd Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 22 Sep 2015 14:51:42 -0700 Subject: Issue #25092: Fix datetime.strftime() failure when errno was already set to EINVAL. --- Misc/NEWS | 3 +++ Modules/timemodule.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 882e310..4876113 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -18,6 +18,9 @@ Core and Builtins Library ------- +- Issue #25092: Fix datetime.strftime() failure when errno was already set to + EINVAL. + - Issue #23517: Fix rounding in fromtimestamp() and utcfromtimestamp() methods of datetime.datetime: microseconds are now rounded to nearest with ties going to nearest even integer (ROUND_HALF_EVEN), instead of being rounding diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 9de3c84..d2caacd 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -653,6 +653,9 @@ time_strftime(PyObject *self, PyObject *args) PyErr_NoMemory(); break; } +#if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__) + errno = 0; +#endif _Py_BEGIN_SUPPRESS_IPH buflen = format_time(outbuf, i, fmt, &buf); _Py_END_SUPPRESS_IPH -- cgit v0.12 From 2495faf8fcbe07ff5a6f422d002a9e39d7eb9e0a Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 22 Sep 2015 15:03:54 -0700 Subject: Closes #25085 and #25086: Exclude distutils and test directories from embeddable distro. --- Tools/msi/make_zip.proj | 2 ++ Tools/msi/make_zip.py | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj index 766fe85..d2e031f 100644 --- a/Tools/msi/make_zip.proj +++ b/Tools/msi/make_zip.proj @@ -14,6 +14,7 @@ python-$(PythonVersion)-embed-$(ArchName) .zip $(OutputPath)\en-us\$(TargetName)$(TargetExt) + rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)" "$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py" $(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName) set DOC_FILENAME=python$(PythonVersion).chm @@ -23,6 +24,7 @@ set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140. diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py index c256008..96fdad2 100644 --- a/Tools/msi/make_zip.py +++ b/Tools/msi/make_zip.py @@ -15,6 +15,20 @@ TKTCL_RE = re.compile(r'^(_?tk|tcl).+\.(pyd|dll)', re.IGNORECASE) DEBUG_RE = re.compile(r'_d\.(pyd|dll|exe)$', re.IGNORECASE) PYTHON_DLL_RE = re.compile(r'python\d\d?\.dll$', re.IGNORECASE) +EXCLUDE_FROM_LIBRARY = { + '__pycache__', + 'ensurepip', + 'idlelib', + 'pydoc_data', + 'site-packages', + 'tkinter', + 'turtledemo', +} + +EXCLUDE_FILE_FROM_LIBRARY = { + 'bdist_wininst.py', +} + def is_not_debug(p): if DEBUG_RE.search(p.name): return False @@ -37,16 +51,21 @@ def is_not_debug_or_python(p): def include_in_lib(p): name = p.name.lower() if p.is_dir(): - if name in {'__pycache__', 'ensurepip', 'idlelib', 'pydoc_data', 'tkinter', 'turtledemo'}: + if name in EXCLUDE_FROM_LIBRARY: return False if name.startswith('plat-'): return False if name == 'test' and p.parts[-2].lower() == 'lib': return False + if name in {'test', 'tests'} and p.parts[-3].lower() == 'lib': + return False return True + if name in EXCLUDE_FILE_FROM_LIBRARY: + return False + suffix = p.suffix.lower() - return suffix not in {'.pyc', '.pyo'} + return suffix not in {'.pyc', '.pyo', '.exe'} def include_in_tools(p): if p.is_dir() and p.name.lower() in {'scripts', 'i18n', 'pynche', 'demo', 'parser'}: -- cgit v0.12 From bc25032c924d8fa00b2c8b94e823fd544d00c5e3 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 22 Sep 2015 16:36:29 -0700 Subject: Issue #25091: Increases font size of the installer. --- Misc/NEWS | 2 + Tools/msi/bundle/Default.thm | 160 +++++++++++++++++++++---------------------- Tools/msi/bundle/SideBar.png | Bin 19170 -> 57891 bytes 3 files changed, 82 insertions(+), 80 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 4876113..bad974e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -150,6 +150,8 @@ Build Windows ------- +- Issue #25091: Increases font size of the installer. + - Issue #25213: Restores requestedExecutionLevel to manifest to disable UAC virtualization. diff --git a/Tools/msi/bundle/Default.thm b/Tools/msi/bundle/Default.thm index d919bea..f575a98 100644 --- a/Tools/msi/bundle/Default.thm +++ b/Tools/msi/bundle/Default.thm @@ -1,136 +1,136 @@ - #(loc.Caption) - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI + #(loc.Caption) + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI - #(loc.HelpHeader) - + #(loc.HelpHeader) + #(loc.HelpText) - + - #(loc.InstallHeader) - + #(loc.InstallHeader) + #(loc.InstallMessage) - - + + - #(loc.ShortPrependPathLabel) - #(loc.ShortInstallLauncherAllUsersLabel) + #(loc.ShortPrependPathLabel) + #(loc.ShortInstallLauncherAllUsersLabel) - + - #(loc.InstallUpgradeHeader) - + #(loc.InstallUpgradeHeader) + #(loc.InstallUpgradeMessage) - - + + - + - #(loc.InstallHeader) - + #(loc.InstallHeader) + - + - + - #(loc.Custom1Header) - + #(loc.Custom1Header) + - #(loc.Include_docLabel) - #(loc.Include_docHelpLabel) + #(loc.Include_docLabel) + #(loc.Include_docHelpLabel) - #(loc.Include_pipLabel) - #(loc.Include_pipHelpLabel) + #(loc.Include_pipLabel) + #(loc.Include_pipHelpLabel) - #(loc.Include_tcltkLabel) - #(loc.Include_tcltkHelpLabel) + #(loc.Include_tcltkLabel) + #(loc.Include_tcltkHelpLabel) - #(loc.Include_testLabel) - #(loc.Include_testHelpLabel) + #(loc.Include_testLabel) + #(loc.Include_testHelpLabel) - #(loc.Include_launcherLabel) - #(loc.InstallLauncherAllUsersLabel) - #(loc.Include_launcherHelpLabel) + #(loc.Include_launcherLabel) + #(loc.InstallLauncherAllUsersLabel) + #(loc.Include_launcherHelpLabel) - - - + + + - #(loc.Custom2Header) - + #(loc.Custom2Header) + - #(loc.InstallAllUsersLabel) - #(loc.AssociateFilesLabel) - #(loc.ShortcutsLabel) - #(loc.PrependPathLabel) - #(loc.PrecompileLabel) - #(loc.Include_symbolsLabel) - #(loc.Include_debugLabel) - - #(loc.CustomLocationLabel) - - - #(loc.CustomLocationHelpLabel) - - - - + #(loc.InstallAllUsersLabel) + #(loc.AssociateFilesLabel) + #(loc.ShortcutsLabel) + #(loc.PrependPathLabel) + #(loc.PrecompileLabel) + #(loc.Include_symbolsLabel) + #(loc.Include_debugLabel) + + #(loc.CustomLocationLabel) + + + #(loc.CustomLocationHelpLabel) + + + + - #(loc.ProgressHeader) - + #(loc.ProgressHeader) + - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + - #(loc.ModifyHeader) - + #(loc.ModifyHeader) + - - - + + + - + - #(loc.SuccessHeader) - + #(loc.SuccessHeader) + #(loc.SuccessRestartText) - - + + - #(loc.FailureHeader) - + #(loc.FailureHeader) + #(loc.FailureHyperlinkLogText) #(loc.FailureRestartText) - - + + \ No newline at end of file diff --git a/Tools/msi/bundle/SideBar.png b/Tools/msi/bundle/SideBar.png index 9c18fff..a23ce5e 100644 Binary files a/Tools/msi/bundle/SideBar.png and b/Tools/msi/bundle/SideBar.png differ -- cgit v0.12 From 14b9e6c6a7a5890a11c87247ba01867fbd7b8d49 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 22 Sep 2015 16:36:33 -0700 Subject: Issue #25126: Clarifies that the non-web installer will download some components. --- Misc/NEWS | 3 +++ Tools/msi/bundle/Default.wxl | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index bad974e..5440470 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -152,6 +152,9 @@ Windows - Issue #25091: Increases font size of the installer. +- Issue #25126: Clarifies that the non-web installer will download some + components. + - Issue #25213: Restores requestedExecutionLevel to manifest to disable UAC virtualization. diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl index 7af907e..f3d89d9 100644 --- a/Tools/msi/bundle/Default.wxl +++ b/Tools/msi/bundle/Default.wxl @@ -86,8 +86,8 @@ Select Customize to review current options. for &all users (requires elevation) Install &launcher for all users (recommended) &Precompile standard library - Install debugging &symbols - Install debu&g binaries (requires VS 2015 or later) + Download debugging &symbols + Download debu&g binaries (requires VS 2015 or later) [ActionLikeInstallation] Progress [ActionLikeInstalling]: -- cgit v0.12 From 44fe401aa3afbb1173c1ca5aff18fc6c2efe8238 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 22 Sep 2015 16:36:33 -0700 Subject: Issue #25081: Makes Back button in installer go back to upgrade page when upgrading. --- Misc/NEWS | 3 +++ Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 5440470..2ed6491 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -150,6 +150,9 @@ Build Windows ------- +- Issue #25081: Makes Back button in installer go back to upgrade page when + upgrading. + - Issue #25091: Increases font size of the installer. - Issue #25126: Clarifies that the non-web installer will download some diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 35ed2fe..99884e4 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -323,6 +323,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { SavePageSettings(); if (_modifying) { GoToPage(PAGE_MODIFY); + } else if (_upgrading) { + GoToPage(PAGE_UPGRADE); } else { GoToPage(PAGE_INSTALL); } @@ -2524,6 +2526,7 @@ private: case BOOTSTRAPPER_ACTION_INSTALL: if (_upgradingOldVersion) { _installPage = PAGE_UPGRADE; + _upgrading = TRUE; } else if (SUCCEEDED(BalGetNumericVariable(L"SimpleInstall", &simple)) && simple) { _installPage = PAGE_SIMPLE_INSTALL; } else { @@ -3029,6 +3032,7 @@ public: _suppressDowngradeFailure = FALSE; _suppressRepair = FALSE; _modifying = FALSE; + _upgrading = FALSE; _overridableVariables = nullptr; _taskbarList = nullptr; @@ -3113,6 +3117,7 @@ private: BOOL _suppressDowngradeFailure; BOOL _suppressRepair; BOOL _modifying; + BOOL _upgrading; int _crtInstalledToken; -- cgit v0.12 From a2ea0e4804f30cdc754b1ed6a37fff30fd8a5378 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 22 Sep 2015 16:45:19 -0700 Subject: Issue #25102: Windows installer does not precompile for -O or -OO. --- Misc/NEWS | 2 + Tools/msi/bundle/bundle.wxl | 2 + Tools/msi/bundle/packagegroups/postinstall.wxs | 51 +++++++++++++++++++++++--- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 2ed6491..36cb6e4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -150,6 +150,8 @@ Build Windows ------- +- Issue #25102: Windows installer does not precompile for -O or -OO. + - Issue #25081: Makes Back button in installer go back to upgrade page when upgrading. diff --git a/Tools/msi/bundle/bundle.wxl b/Tools/msi/bundle/bundle.wxl index 684e0da..d7a65c4 100644 --- a/Tools/msi/bundle/bundle.wxl +++ b/Tools/msi/bundle/bundle.wxl @@ -2,4 +2,6 @@ C Runtime Update (KB2999226) Precompiling standard library + Precompiling standard library (-O) + Precompiling standard library (-OO) diff --git a/Tools/msi/bundle/packagegroups/postinstall.wxs b/Tools/msi/bundle/packagegroups/postinstall.wxs index 7b0f3fc..b40c2a5 100644 --- a/Tools/msi/bundle/packagegroups/postinstall.wxs +++ b/Tools/msi/bundle/packagegroups/postinstall.wxs @@ -40,23 +40,64 @@ - + + + + + +