Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
f5690925
Commit
f5690925
authored
Jun 21, 2019
by
Steve Dower
Committed by
GitHub
Jun 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-37351: Removes libpython38.a from standard Windows distribution (#14276)
parent
e56a123f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
37 deletions
+21
-37
Doc/whatsnew/3.8.rst
Doc/whatsnew/3.8.rst
+19
-0
Misc/NEWS.d/next/Windows/2019-06-20-12-50-32.bpo-37351.asTnVW.rst
...S.d/next/Windows/2019-06-20-12-50-32.bpo-37351.asTnVW.rst
+1
-0
Tools/msi/README.txt
Tools/msi/README.txt
+1
-3
Tools/msi/dev/dev.wixproj
Tools/msi/dev/dev.wixproj
+0
-21
Tools/msi/dev/dev.wxs
Tools/msi/dev/dev.wxs
+0
-3
Tools/msi/dev/dev_files.wxs
Tools/msi/dev/dev_files.wxs
+0
-10
No files found.
Doc/whatsnew/3.8.rst
View file @
f5690925
...
...
@@ -1461,6 +1461,25 @@ Changes in the C API
* The functions :c:func:`PyNode_AddChild` and :c:func:`PyParser_AddToken` now accept
two additional ``int`` arguments *end_lineno* and *end_col_offset*.
.. highlight:: shell
* The :file:`libpython38.a` file to allow MinGW tools to link directly against
:file:`python38.dll` is no longer included in the regular Windows distribution.
If you require this file, it may be generated with the ``gendef`` and
``dlltool`` tools, which are part of the MinGW binutils package::
gendef python38.dll > tmp.def
dlltool --dllname python38.dll --def tmp.def --output-lib libpython38.a
The location of an installed :file:`pythonXY.dll` will depend on the
installation options and the version and language of Windows. See
:ref:`using-on-windows` for more information. The resulting library should be
placed in the same directory as :file:`pythonXY.lib`, which is generally the
:file:`libs` directory under your Python installation.
.. highlight:: python3
CPython bytecode changes
------------------------
...
...
Misc/NEWS.d/next/Windows/2019-06-20-12-50-32.bpo-37351.asTnVW.rst
0 → 100644
View file @
f5690925
Removes libpython38.a from standard Windows distribution.
Tools/msi/README.txt
View file @
f5690925
...
...
@@ -159,9 +159,7 @@ The following properties may be passed when building these projects.
/p:BuildForRelease=(true|false)
When true, adds extra verification to ensure a complete installer is
produced. For example, binutils is required when building for a release
to generate MinGW-compatible libraries, and the build will be aborted if
this fails. Defaults to false.
produced. Defaults to false.
/p:ReleaseUri=(any URI)
Used to generate unique IDs for the installers to allow side-by-side
...
...
Tools/msi/dev/dev.wixproj
View file @
f5690925
...
...
@@ -7,12 +7,6 @@
<OutputType>
Package
</OutputType>
</PropertyGroup>
<Import
Project=
"..\msi.props"
/>
<PropertyGroup>
<DefineConstants
Condition=
"$(BuildForRelease) and $(SuppressMinGWLib) == ''"
>
$(DefineConstants);
IncludeMinGWLib=1;
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile
Include=
"dev.wxs"
/>
<Compile
Include=
"dev_files.wxs"
/>
...
...
@@ -31,20 +25,5 @@
</InstallFiles>
</ItemGroup>
<Target
Name=
"BuildMinGWLib"
Inputs=
"$(BuildPath)$(PyDllName).dll"
Outputs=
"$(BuildPath)lib$(PyDllName).a"
AfterTargets=
"PrepareForBuild"
Condition=
"$(BuildForRelease) and $(SuppressMinGWLib) == ''"
>
<!-- Build libpython##.a as part of this project. This requires gendef and dlltool on the path. -->
<PropertyGroup>
<_DllToolOpts>
-m i386 --as-flags=--32
</_DllToolOpts>
<_DllToolOpts
Condition=
"$(Platform) == 'x64'"
>
-m i386:x86-64
</_DllToolOpts>
</PropertyGroup>
<Exec
Command=
'gendef - "$(BuildPath)$(PyDllName).dll" > "$(IntermediateOutputPath)mingwlib.def"'
ContinueOnError=
"false"
/>
<Exec
Command=
'dlltool --dllname $(PyDllName).dll --def "$(IntermediateOutputPath)mingwlib.def" --output-lib "$(BuildPath)lib$(PyDllName).a" $(_DllToolOpts)'
/>
</Target>
<Import
Project=
"..\msi.targets"
/>
</Project>
Tools/msi/dev/dev.wxs
View file @
f5690925
...
...
@@ -10,9 +10,6 @@
<ComponentGroupRef
Id=
"dev_include"
/>
<ComponentGroupRef
Id=
"dev_pyconfig"
/>
<ComponentGroupRef
Id=
"dev_libs"
/>
<?ifdef IncludeMinGWLib ?>
<ComponentGroupRef
Id=
"dev_mingw"
/>
<?endif ?>
<ComponentRef
Id=
"OptionalFeature"
/>
</Feature>
</Product>
...
...
Tools/msi/dev/dev_files.wxs
View file @
f5690925
...
...
@@ -29,14 +29,4 @@
</Component>
</ComponentGroup>
</Fragment>
<?ifdef IncludeMinGWLib ?>
<Fragment>
<ComponentGroup
Id=
"dev_mingw"
>
<Component
Id=
"libs_libpython.a"
Directory=
"libs"
Guid=
"*"
>
<File
Id=
"libs_libpython.a"
Name=
"libpython$(var.MajorVersionNumber)$(var.MinorVersionNumber).a"
KeyPath=
"yes"
/>
</Component>
</ComponentGroup>
</Fragment>
<?endif ?>
</Wix>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment