Merged revisions 69489-69490 via svnmerge from

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

........
  r69489 | martin.v.loewis | 2009-02-10 14:09:19 +0100 (Di, 10 Feb 2009) | 1 line

  Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
........
  r69490 | martin.v.loewis | 2009-02-10 14:12:12 +0100 (Di, 10 Feb 2009) | 1 line

  Set eol-style to native
........

diff --git a/Misc/NEWS b/Misc/NEWS
index efedd79d3c7af3f2b66c42d75494c86dafb2c3dd..5970332dac232d927c7e6030374e2651327a9bd6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -437,6 +437,8 @@ Tools/Demos
 Build
 -----
 
+- Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
+
 - Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows.
 
 - Issue #4895: Use _strdup on Windows CE.

diff --git a/PCbuild/sqlite3.vcproj b/PCbuild/sqlite3.vcproj
index 2a64fffe304324e98adad7cf9d838e1a24d319b5..0af1cdc07b72830daddc7d5fae2d0154e2147a6b 100644 (file)
--- a/PCbuild/sqlite3.vcproj
+++ b/PCbuild/sqlite3.vcproj
@@ -22,7 +22,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd_d.vsprops"
+                       InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops"
                        CharacterSet="0"
                        >
                        <Tool
@@ -42,8 +42,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -83,7 +82,7 @@
                <Configuration
                        Name="Debug|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
+                       InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\debug.vsprops"
                        CharacterSet="0"
                        >
                        <Tool
@@ -104,8 +103,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -145,7 +143,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops"
+                       InheritedPropertySheets=".\sqlite3.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -166,8 +164,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -207,7 +204,7 @@
                <Configuration
                        Name="Release|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
+                       InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -229,8 +226,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -270,7 +266,7 @@
                <Configuration
                        Name="PGInstrument|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
+                       InheritedPropertySheets=".\sqlite3.vsprops;.\pginstrument.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -291,8 +287,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories="&quot;$(sqlite3Dir)&quot;"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -332,7 +327,7 @@
                <Configuration
                        Name="PGInstrument|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
+                       InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\pginstrument.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -354,8 +349,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -394,7 +388,7 @@
                <Configuration
                        Name="PGUpdate|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
+                       InheritedPropertySheets=".\sqlite3.vsprops;.\pgupdate.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -415,8 +409,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -456,7 +449,7 @@
                <Configuration
                        Name="PGUpdate|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
+                       InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\pgupdate.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -478,8 +471,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"

diff --git a/PCbuild/sqlite3.vsprops b/PCbuild/sqlite3.vsprops
new file mode 100644 (file)
index 0000000..420ba6c
--- /dev/null
+++ b/PCbuild/sqlite3.vsprops
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="sqlite3"
+       InheritedPropertySheets=".\pyproject.vsprops"
+       >
+       <Tool
+               Name="VCCLCompilerTool"
+               AdditionalIncludeDirectories="$(sqlite3Dir)"
+               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+               WarningLevel="1"
+       />
+</VisualStudioPropertySheet>