Skip to content

C
cpython
Kaydet (Commit) 527dc8af authored tarafından Steve Dower's avatar Steve Dower
Dosyalara gözat
Seçenekler

Issue #26132: Only adds manifest to executables and main DLL.

üst 6ddd9273
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 5 deletions
PCbuild/pyproject.props
Dosyayı görüntüle @ 527dc8af
...@@ -8,12 +8,9 @@ ...@@ -8,12 +8,9 @@
<IntDir Condition="'$(Configuration)' == 'PGInstrument' or '$(Configuration)' == 'PGUpdate'">$(SolutionDir)obj\$(ArchName)\$(ProjectName)\</IntDir> <IntDir Condition="'$(Configuration)' == 'PGInstrument' or '$(Configuration)' == 'PGUpdate'">$(SolutionDir)obj\$(ArchName)\$(ProjectName)\</IntDir>
<TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName> <TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName>
<TargetName>$(TargetName)$(PyDebugExt)</TargetName> <TargetName>$(TargetName)$(PyDebugExt)</TargetName>
<GenerateManifest Condition="'$(GenerateManifest)' == ''">false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<EmbedManifest Condition="'$(EmbedManifest)' == ''">false</EmbedManifest> <EmbedManifest>false</EmbedManifest>
<!-- For VS2008, we have to embed the manifest to be able to run -->
<!-- BasePlatformToolset is for ICC support --> <!-- BasePlatformToolset is for ICC support -->
<GenerateManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</GenerateManifest>
<EmbedManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</EmbedManifest>
<SupportPGO Condition="'$(SupportPGO)' == ''">true</SupportPGO> <SupportPGO Condition="'$(SupportPGO)' == ''">true</SupportPGO>
<SupportSigning Condition="'$(SupportSigning)' == ''">true</SupportSigning> <SupportSigning Condition="'$(SupportSigning)' == ''">true</SupportSigning>
<SupportSigning Condition="'$(Configuration)' == 'Debug'">false</SupportSigning> <SupportSigning Condition="'$(Configuration)' == 'Debug'">false</SupportSigning>
......
PCbuild/python.vcxproj
Dosyayı görüntüle @ 527dc8af
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<!-- For VS2008, we have to embed the manifest to be able to run -->
<GenerateManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</GenerateManifest>
<EmbedManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</EmbedManifest>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
......
PCbuild/pythoncore.vcxproj
Dosyayı görüntüle @ 527dc8af
...@@ -59,6 +59,9 @@ ...@@ -59,6 +59,9 @@
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<TargetName>$(PyDllName)</TargetName> <TargetName>$(PyDllName)</TargetName>
<!-- For VS2008, we have to embed the manifest to be able to run -->
<GenerateManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</GenerateManifest>
<EmbedManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</EmbedManifest>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<CustomBuildBeforeTargets>Link</CustomBuildBeforeTargets> <CustomBuildBeforeTargets>Link</CustomBuildBeforeTargets>
......
PCbuild/pythonw.vcxproj
Dosyayı görüntüle @ 527dc8af
...@@ -44,6 +44,9 @@ ...@@ -44,6 +44,9 @@
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<!-- For VS2008, we have to embed the manifest to be able to run -->
<GenerateManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</GenerateManifest>
<EmbedManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</EmbedManifest>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
...@@ -55,6 +58,9 @@ ...@@ -55,6 +58,9 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<!-- For VS2008, we have to embed the manifest to be able to run -->
<GenerateManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</GenerateManifest>
<EmbedManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</EmbedManifest>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<Link> <Link>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment