[Python-checkins] r67121 - in python/branches/release26-maint: Misc/NEWS PCbuild/pyd.vsprops PCbuild/pyd_d.vsprops

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Nov  6 18:29:54 2008
New Revision: 67121

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/PCbuild/pyd.vsprops
   python/branches/release26-maint/PCbuild/pyd_d.vsprops

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Thu Nov  6 18:29:54 2008
@@ -55,6 +55,8 @@
 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.

Modified: python/branches/release26-maint/PCbuild/pyd.vsprops
==============================================================================
--- python/branches/release26-maint/PCbuild/pyd.vsprops	(original)
+++ python/branches/release26-maint/PCbuild/pyd.vsprops	Thu Nov  6 18:29:54 2008
@@ -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"

Modified: python/branches/release26-maint/PCbuild/pyd_d.vsprops
==============================================================================
--- python/branches/release26-maint/PCbuild/pyd_d.vsprops	(original)
+++ python/branches/release26-maint/PCbuild/pyd_d.vsprops	Thu Nov  6 18:29:54 2008
@@ -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"