Merged revisions 67120 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67120 | martin.v.loewis | 2008-11-06 17:43:00 +0100 (Do, 06 Nov 2008) | 2 lines

  Issue #4120: Exclude manifest from extension modules in VS2008.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index e4a898fbb70d7c0c29db2b51fe3386d78876376e..8820b91c6095080938e81a3f591b117fe281f8df 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -55,6 +55,8 @@ Library
 Build
 -----
 
+- Issue #4120: Exclude manifest from extension modules in VS2008.
+
 - Issue #4091: Install pythonxy.dll in system32 again.
 
 - Issue #4018: Disable "for me" installations on Vista.

diff --git a/PCbuild/pyd.vsprops b/PCbuild/pyd.vsprops
index 726cebd1b0089b0daef3901dc856534bd1153e65..ee79e7f1fb092e00f797c94b2c3f093c8ac9d58e 100644 (file)
--- a/PCbuild/pyd.vsprops
+++ b/PCbuild/pyd.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+
 <VisualStudioPropertySheet
        ProjectType="Visual C++"
        Version="8.00"
@@ -15,6 +15,11 @@
                OutputFile="$(OutDir)\$(ProjectName).pyd"
                ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
                ImportLibrary="$(OutDir)\$(TargetName).lib"
+               GenerateManifest="false"
+       />
+       <Tool
+               Name="VCManifestTool"
+               EmbedManifest="false"
        />
        <Tool
                Name="VCPostBuildEventTool"

diff --git a/PCbuild/pyd_d.vsprops b/PCbuild/pyd_d.vsprops
index f838b67d8ad0cb8863ab74c195919e965a6fd950..8508156314882ddcd05696587620f7f7ab89f835 100644 (file)
--- a/PCbuild/pyd_d.vsprops
+++ b/PCbuild/pyd_d.vsprops
@@ -19,6 +19,11 @@
                LinkIncremental="1"
                ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
                ImportLibrary="$(OutDir)\$(TargetName).lib"
+               GenerateManifest="false"
+       />
+       <Tool
+               Name="VCManifestTool"
+               EmbedManifest="false"
        />
        <Tool
                Name="VCPostBuildEventTool"