cpython: 45ba976b7064 (original) (raw)

Mercurial > cpython

changeset 104021:45ba976b7064 3.5

Issue #28251: Improvements to help manuals on Windows. [#28251]

Steve Dower steve.dower@microsoft.com
date	Thu, 22 Sep 2016 17:07:56 -0700
parents	39ae3a9501ca
children	e703c3a390f7 cbe049647a04
files	Doc/tools/templates/layout.html Doc/whatsnew/3.5.rst Doc/whatsnew/changelog.rst Misc/NEWS PCbuild/python.vcxproj Tools/msi/build.bat Tools/msi/doc/doc.wxs
diffstat	7 files changed, 28 insertions(+), 6 deletions(-)[+] [-] Doc/tools/templates/layout.html 6 Doc/whatsnew/3.5.rst 3 Doc/whatsnew/changelog.rst 2 Misc/NEWS 2 PCbuild/python.vcxproj 6 Tools/msi/build.bat 3 Tools/msi/doc/doc.wxs 12

line wrap: on

line diff

--- a/Doc/tools/templates/layout.html +++ b/Doc/tools/templates/layout.html @@ -14,6 +14,7 @@ {% endblock %} {%- macro searchbox() %} {# modified from sphinx/themes/basic/searchbox.html #}

{%- if builder != "htmlhelp" %}
[](#l1.8) [](#l1.9) [](#l1.10)

@@ -23,11 +24,12 @@

{%- endif %}

{%- endmacro %} {% block relbar1 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %} {% block relbar2 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %} {% block relbaritems %}

{%- if pagename != "search" and builder != "singlehtml" %}

{%- if pagename != "search" and builder != "singlehtml" and builder != "htmlhelp" %}
[](#l1.22) {{ searchbox() }}[](#l1.23) {{ reldelim2 }}[](#l1.24)

@@ -36,6 +38,7 @@ {% endblock %} {% block extrahead %}

{% if builder != "htmlhelp" %} {% if not embedded %}{% endif %} {% if versionswitcher is defined and not embedded %}{% endif %} {% if pagename == 'whatsnew/changelog' and not embedded %} @@ -95,6 +98,7 @@ }); {% endif %}
{% endif %}

{{ super() }} {% endblock %} {% block footer %}

--- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -46,8 +46,7 @@ This article explains the new features in Python 3.5, compared to 3.4. Python 3.5 was released on September 13, 2015. See the -changelog <https://docs.python.org/3.5/whatsnew/changelog.html>_ for a full -list of changes. +:ref:changelog <changelog> for a full list of changes. .. seealso::

--- a/Doc/whatsnew/changelog.rst +++ b/Doc/whatsnew/changelog.rst @@ -1,3 +1,5 @@ +.. _changelog: + +++++++++ Changelog +++++++++

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -362,6 +362,8 @@ Tools/Demos Windows ------- +- Issue #28251: Improvements to help manuals on Windows. +

Issue #28110: launcher.msi has different product codes between 32-bit and 64-bit

--- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -88,7 +88,9 @@ ucrtbase ucrtbased

<Exec Command='setlocal

+set PYTHONPATH=$(PySourcePath)Lib +"$(OutDir)python$(PyDebugExt).exe" "$(PySourcePath)PC\validate_ucrtbase.py" $(UcrtName)' ContinueOnError="true" /> @@ -99,6 +101,8 @@ @rem This is only meant as a convenience for developing CPython @rem and using it outside of that context is ill-advised. @echo Running (Configuration)∣(Configuration)^|(Configuration)∣(Platform) interpreter... +@setlocal +@set PYTHONHOME=$(PySourcePath) @"$(OutDir)python$(PyDebugExt).exe" %* </_Content> <_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat'))</_ExistingContent>

--- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -43,6 +43,9 @@ if defined BUILDDOC ( if errorlevel 1 goto :eof ) +rem Build the launcher MSI separately +msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 + set BUILD_CMD="%D%bundle\snapshot.wixproj" if defined BUILDTEST ( set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true

--- a/Tools/msi/doc/doc.wxs +++ b/Tools/msi/doc/doc.wxs @@ -7,6 +7,12 @@

   <Property Id="HHExe" Value="C:\Windows\hh.exe" />[](#l7.7)

   <CustomAction Id="SetHHExe" Property="HHCExe" Value='[WindowsFolder]\hh.exe' Execute="immediate" />[](#l7.8)

```
   <InstallExecuteSequence>[](#l7.9)
```

       <Custom Action="SetHHExe" Before="CostFinalize">1</Custom>[](#l7.10)

```
   </InstallExecuteSequence>[](#l7.11)
```

   [](#l7.12)
   <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">[](#l7.13)
       <ComponentGroupRef Id="doc" Primary="yes" />[](#l7.14)
       <ComponentRef Id="OptionalFeature" />[](#l7.15)

@@ -20,10 +26,12 @@ <Shortcut Id="python.chm"

                     Target="[#python.chm]"[](#l7.20)

                     Target="[HHExe]"[](#l7.21)

                     Arguments="[#python.chm]"[](#l7.22)
                     Name="!(loc.ShortcutName)"[](#l7.23)
                     Description="!(loc.ShortcutDescription)"[](#l7.24)

                     WorkingDirectory="InstallDirectory" />[](#l7.25)

                     WorkingDirectory="InstallDirectory"[](#l7.26)

                     Show="maximized" />[](#l7.27)
           <RemoveFolder Id="Remove_MenuDir" On="uninstall" />[](#l7.28)
       </Component>[](#l7.29)
       <?endif ?>[](#l7.30)