Skip to content

Commit fb4a96a

Browse files
zoobazooba
committed
Issue python#28251: Improvements to help manuals on Windows.
1 parent 208bbd2 commit fb4a96a

File tree

7 files changed

+28
-6
lines changed

7 files changed

+28
-6
lines changed

‎Doc/tools/templates/layout.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
{% endblock %}
1515
{%- macro searchbox() %}
1616
{# modified from sphinx/themes/basic/searchbox.html #}
17+
{%- if builder != "htmlhelp" %}
1718
<div class="inline-search" style="display: none" role="search">
1819
<form class="inline-search" action="{{ pathto('search') }}" method="get">
1920
<input placeholder="{{ _('Quick search') }}" type="text" name="q" />
@@ -23,11 +24,12 @@
2324
</form>
2425
</div>
2526
<script type="text/javascript">$('.inline-search').show(0);</script>
27+
{%- endif %}
2628
{%- endmacro %}
2729
{% block relbar1 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %}
2830
{% block relbar2 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %}
2931
{% block relbaritems %}
30-
{%- if pagename != "search" and builder != "singlehtml" %}
32+
{%- if pagename != "search" and builder != "singlehtml" and builder != "htmlhelp" %}
3133
<li class="right">
3234
{{ searchbox() }}
3335
{{ reldelim2 }}
@@ -36,6 +38,7 @@
3638
{% endblock %}
3739
{% block extrahead %}
3840
<link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
41+
{% if builder != "htmlhelp" %}
3942
{% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
4043
{% if versionswitcher is defined and not embedded %}<script type="text/javascript" src="{{ pathto('_static/version_switch.js', 1) }}"></script>{% endif %}
4144
{% if pagename == 'whatsnew/changelog' and not embedded %}
@@ -95,6 +98,7 @@
9598
});
9699
</script>
97100
{% endif %}
101+
{% endif %}
98102
{{ super() }}
99103
{% endblock %}
100104
{% block footer %}

‎Doc/whatsnew/3.5.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
4747
This article explains the new features in Python 3.5, compared to 3.4.
4848
Python 3.5 was released on September 13, 2015.  See the
49-
`changelog <https://docs.python.org/3.5/whatsnew/changelog.html>`_ for a full
50-
list of changes.
49+
:ref:`changelog <changelog>` for a full list of changes.
5150

5251
.. seealso::
5352

‎Doc/whatsnew/changelog.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _changelog:
2+
13
+++++++++
24
Changelog
35
+++++++++

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,8 @@ Tools/Demos
362362
Windows
363363
-------
364364

365+
- Issue #28251: Improvements to help manuals on Windows.
366+
365367
- Issue #28110: launcher.msi has different product codes between 32-bit and
366368
64-bit
367369

‎PCbuild/python.vcxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@
8888
<UcrtName>ucrtbase</UcrtName>
8989
<UcrtName Condition="'$(Configuration)' == 'Debug'">ucrtbased</UcrtName>
9090
</PropertyGroup>
91-
<Exec Command='"$(OutDir)python$(PyDebugExt).exe" "$(PySourcePath)PC\validate_ucrtbase.py" $(UcrtName)' ContinueOnError="true" />
91+
<Exec Command='setlocal
92+
set PYTHONPATH=$(PySourcePath)Lib
93+
"$(OutDir)python$(PyDebugExt).exe" "$(PySourcePath)PC\validate_ucrtbase.py" $(UcrtName)' ContinueOnError="true" />
9294
</Target>
9395
<Target Name="GeneratePythonBat" AfterTargets="AfterBuild">
9496
<PropertyGroup>
@@ -99,6 +101,8 @@
99101
@rem This is only meant as a convenience for developing CPython
100102
@rem and using it outside of that context is ill-advised.
101103
@echo Running $(Configuration)^|$(Platform) interpreter...
104+
@setlocal
105+
@set PYTHONHOME=$(PySourcePath)
102106
@"$(OutDir)python$(PyDebugExt).exe" %*
103107
</_Content>
104108
<_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat'))</_ExistingContent>

‎Tools/msi/build.bat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ if defined BUILDDOC (
4343
if errorlevel 1 goto :eof
4444
)
4545

46+
rem Build the launcher MSI separately
47+
msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86
48+
4649
set BUILD_CMD="%D%bundle\snapshot.wixproj"
4750
if defined BUILDTEST (
4851
set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true

‎Tools/msi/doc/doc.wxs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<PropertyRef Id="UpgradeTable" />
88
<PropertyRef Id="REGISTRYKEY" />
99

10+
<Property Id="HHExe" Value="C:\Windows\hh.exe" />
11+
<CustomAction Id="SetHHExe" Property="HHCExe" Value='[WindowsFolder]\hh.exe' Execute="immediate" />
12+
<InstallExecuteSequence>
13+
<Custom Action="SetHHExe" Before="CostFinalize">1</Custom>
14+
</InstallExecuteSequence>
15+
1016
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
1117
<ComponentGroupRef Id="doc" Primary="yes" />
1218
<ComponentRef Id="OptionalFeature" />
@@ -20,10 +26,12 @@
2026
<RegistryValue Name="$(var.OptionalFeatureName)_shortcut" Type="string" Value="$(var.Version)" KeyPath="yes" />
2127
</RegistryKey>
2228
<Shortcut Id="python.chm"
23-
Target="[#python.chm]"
29+
Target="[HHExe]"
30+
Arguments="[#python.chm]"
2431
Name="!(loc.ShortcutName)"
2532
Description="!(loc.ShortcutDescription)"
26-
WorkingDirectory="InstallDirectory" />
33+
WorkingDirectory="InstallDirectory"
34+
Show="maximized" />
2735
<RemoveFolder Id="Remove_MenuDir" On="uninstall" />
2836
</Component>
2937
<?endif ?>

0 commit comments

Comments
 (0)