Issue #28251: Improvements to help manuals on Windows.
This commit is contained in:
commit
765285337a
|
@ -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 %}
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
|
||||
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 :ref:`changelog <changelog>`.
|
||||
|
||||
.. note::
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
.. _changelog:
|
||||
|
||||
+++++++++
|
||||
Changelog
|
||||
+++++++++
|
||||
|
|
|
@ -97,6 +97,8 @@ Library
|
|||
Windows
|
||||
-------
|
||||
|
||||
- Issue #28251: Improvements to help manuals on Windows.
|
||||
|
||||
- Issue #28110: launcher.msi has different product codes between 32-bit and
|
||||
64-bit
|
||||
|
||||
|
|
|
@ -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...
|
||||
@setlocal
|
||||
@set PYTHONHOME=$(PySourcePath)
|
||||
@"$(OutDir)python$(PyDebugExt).exe" %*
|
||||
</_Content>
|
||||
<_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat'))</_ExistingContent>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ?>
|
||||
|
|
Loading…
Reference in New Issue