diff options
| author | Steve Dower <steve.dower@python.org> | 2019-06-21 21:28:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-21 21:28:46 (GMT) |
| commit | f5690925df897cf45818bf944b28d13f37b9f8ca (patch) | |
| tree | 5c287e9145716d550b7a3305773829d69309579d /Tools/msi/dev | |
| parent | e56a123fd0acaa295a28b98d2e46d956b97d1263 (diff) | |
| download | cpython-f5690925df897cf45818bf944b28d13f37b9f8ca.zip cpython-f5690925df897cf45818bf944b28d13f37b9f8ca.tar.gz cpython-f5690925df897cf45818bf944b28d13f37b9f8ca.tar.bz2 | |
bpo-37351: Removes libpython38.a from standard Windows distribution (#14276)
Diffstat (limited to 'Tools/msi/dev')
| -rw-r--r-- | Tools/msi/dev/dev.wixproj | 21 | ||||
| -rw-r--r-- | Tools/msi/dev/dev.wxs | 3 | ||||
| -rw-r--r-- | Tools/msi/dev/dev_files.wxs | 10 |
3 files changed, 0 insertions, 34 deletions
diff --git a/Tools/msi/dev/dev.wixproj b/Tools/msi/dev/dev.wixproj index c6e3bcf..4052e4b 100644 --- a/Tools/msi/dev/dev.wixproj +++ b/Tools/msi/dev/dev.wixproj @@ -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> diff --git a/Tools/msi/dev/dev.wxs b/Tools/msi/dev/dev.wxs index a09e139..23a710d 100644 --- a/Tools/msi/dev/dev.wxs +++ b/Tools/msi/dev/dev.wxs @@ -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> diff --git a/Tools/msi/dev/dev_files.wxs b/Tools/msi/dev/dev_files.wxs index 9654d2e..21f9c84 100644 --- a/Tools/msi/dev/dev_files.wxs +++ b/Tools/msi/dev/dev_files.wxs @@ -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> |