[Python-checkins] cpython (merge 3.6 -> default): Issue #28251: Improvements to help manuals on Windows.

Thu Sep 22 20:12:17 EDT 2016

https://hg.python.org/cpython/rev/15f82b64eee0
changeset: 104023:15f82b64eee0
parent: 104020:f624ae0c9140
parent: 104022:e703c3a390f7
user: Steve Dower <steve.dower at microsoft.com>
date: Thu Sep 22 17:11:53 2016 -0700
summary:
 Issue #28251: Improvements to help manuals on Windows.
files:
 Doc/tools/templates/layout.html | 6 +++++-
 Doc/whatsnew/3.6.rst | 3 ++-
 Doc/whatsnew/3.7.rst | 2 +-
 Doc/whatsnew/changelog.rst | 2 ++
 Misc/NEWS | 2 ++
 PCbuild/python.vcxproj | 6 +++++-
 Tools/msi/build.bat | 3 +++
 Tools/msi/doc/doc.wxs | 12 ++++++++++--
 8 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
--- 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" %}
 <div class="inline-search" style="display: none" role="search">
 <form class="inline-search" action="{{ pathto('search') }}" method="get">
 <input placeholder="{{ _('Quick search') }}" type="text" name="q" />
@@ -23,11 +24,12 @@
 </form>
 </div>
 <script type="text/javascript">$('.inline-search').show(0);</script>
+ {%- 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" %}
 <li class="right">
 {{ searchbox() }}
 {{ reldelim2 }}
@@ -36,6 +38,7 @@
 {% endblock %}
 {% block extrahead %}
 <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
+ {% if builder != "htmlhelp" %}
 {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
 {% if versionswitcher is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/version_switch.js', 1) }}"></script>{% endif %}
 {% if pagename == 'whatsnew/changelog' and not embedded %}
@@ -95,6 +98,7 @@
 });
 </script>
 {% endif %}
+ {% endif %}
 {{ super() }}
 {% endblock %}
 {% block footer %}
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -47,7 +47,8 @@
 
 This article explains the new features in Python 3.6, compared to 3.5.
 
-For full details, see the :source:`Misc/NEWS` file.
+For full details, see the
+`changelog <https://docs.python.org/3.6/whatsnew/changelog.html>`_.
 
 .. note::
 
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -47,7 +47,7 @@
 
 This article explains the new features in Python 3.7, compared to 3.6.
 
-For full details, see the :source:`Misc/NEWS` file.
+For full details, see the :ref:`changelog <changelog>`.
 
 .. note::
 
diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst
--- a/Doc/whatsnew/changelog.rst
+++ b/Doc/whatsnew/changelog.rst
@@ -1,3 +1,5 @@
+.. _changelog:
+
 +++++++++
 Changelog
 +++++++++
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,8 @@
 Windows
 -------
 
+- Issue #28251: Improvements to help manuals on Windows.
+
 - Issue #28110: launcher.msi has different product codes between 32-bit and
 64-bit
 
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -88,7 +88,9 @@
 <UcrtName>ucrtbase</UcrtName>
 <UcrtName Condition="'$(Configuration)' == 'Debug'">ucrtbased</UcrtName>
 </PropertyGroup>
- <Exec Command='"$(OutDir)python$(PyDebugExt).exe" "$(PySourcePath)PC\validate_ucrtbase.py" $(UcrtName)' ContinueOnError="true" />
+ <Exec Command='setlocal
+set PYTHONPATH=$(PySourcePath)Lib
+"$(OutDir)python$(PyDebugExt).exe" "$(PySourcePath)PC\validate_ucrtbase.py" $(UcrtName)' ContinueOnError="true" />
 </Target>
 <Target Name="GeneratePythonBat" AfterTargets="AfterBuild">
 <PropertyGroup>
@@ -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)^|$(Platform) interpreter...
+ at setlocal
+ at set PYTHONHOME=$(PySourcePath)
 @"$(OutDir)python$(PyDebugExt).exe" %*
 </_Content>
 <_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat'))</_ExistingContent>
diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat
--- a/Tools/msi/build.bat
+++ b/Tools/msi/build.bat
@@ -43,6 +43,9 @@
 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
diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs
--- a/Tools/msi/doc/doc.wxs
+++ b/Tools/msi/doc/doc.wxs
@@ -7,6 +7,12 @@
 <PropertyRef Id="UpgradeTable" />
 <PropertyRef Id="REGISTRYKEY" />
 
+ <Property Id="HHExe" Value="C:\Windows\hh.exe" />
+ <CustomAction Id="SetHHExe" Property="HHCExe" Value='[WindowsFolder]\hh.exe' Execute="immediate" />
+ <InstallExecuteSequence>
+ <Custom Action="SetHHExe" Before="CostFinalize">1</Custom>
+ </InstallExecuteSequence>
+ 
 <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
 <ComponentGroupRef Id="doc" Primary="yes" />
 <ComponentRef Id="OptionalFeature" />
@@ -20,10 +26,12 @@
 <RegistryValue Name="$(var.OptionalFeatureName)_shortcut" Type="string" Value="$(var.Version)" KeyPath="yes" />
 </RegistryKey>
 <Shortcut Id="python.chm"
- Target="[#python.chm]"
+ Target="[HHExe]"
+ Arguments="[#python.chm]"
 Name="!(loc.ShortcutName)"
 Description="!(loc.ShortcutDescription)"
- WorkingDirectory="InstallDirectory" />
+ WorkingDirectory="InstallDirectory"
+ Show="maximized" />
 <RemoveFolder Id="Remove_MenuDir" On="uninstall" />
 </Component>
 <?endif ?>
-- 
Repository URL: https://hg.python.org/cpython
