Include all interop files in solution.

tonyroberts · tonyroberts · commit d877fa4c487d · 2016-02-29T08:24:38.000Z
Use defines to ensure only the relevant code is included, but add
all files to the project when PythonInteropFile isn't defined.

When building from setup.py explicitly use the interop file that
matches the python.exe in use.
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -178,6 +178,13 @@
   <ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
     <Compile Include="$(PythonInteropFile)" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(PythonInteropFile)' == '' ">
+    <Compile Include="interop26.cs" />
+    <Compile Include="interop27.cs" />
+    <Compile Include="interop32.cs" />
+    <Compile Include="interop34.cs" />
+    <Compile Include="interop35.cs" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="buildclrmodule.bat" />
     <None Include="clrmodule.il" />
diff --git a/src/runtime/interop26.cs b/src/runtime/interop26.cs
@@ -9,7 +9,7 @@
 // WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 // FOR A PARTICULAR PURPOSE.
 // ==========================================================================
-
+#if (PYTHON26)
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -150,3 +150,4 @@ public static int magic() {
         public static int members = 0;
     }
 }
+#endif
diff --git a/src/runtime/interop27.cs b/src/runtime/interop27.cs
@@ -9,7 +9,7 @@
 // WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 // FOR A PARTICULAR PURPOSE.
 // ==========================================================================
-
+#if (PYTHON27)
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -150,3 +150,4 @@ public static int magic() {
         public static int members = 0;
     }
 }
+#endif
diff --git a/src/runtime/interop32.cs b/src/runtime/interop32.cs
@@ -9,7 +9,7 @@
 // WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 // FOR A PARTICULAR PURPOSE.
 // ==========================================================================
-
+#if (PYTHON32)
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -141,3 +141,4 @@ public static int magic() {
         public static int members = 0;
     }
 }
+#endif
diff --git a/src/runtime/interop34.cs b/src/runtime/interop34.cs
@@ -9,7 +9,7 @@
 // WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 // FOR A PARTICULAR PURPOSE.
 // ==========================================================================
-
+#if (PYTHON34)
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -144,3 +144,4 @@ public static int magic() {
         public static int members = 0;
     }
 }
+#endif
diff --git a/src/runtime/interop35.cs b/src/runtime/interop35.cs
@@ -9,7 +9,7 @@
 // WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 // FOR A PARTICULAR PURPOSE.
 // ==========================================================================
-
+#if (PYTHON35)
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -149,3 +149,4 @@ public static int magic() {
         public static int members = 0;
     }
 }
+#endif
diff --git a/tools/geninterop/geninterop.py b/tools/geninterop/geninterop.py
@@ -198,6 +198,18 @@ def preprocess_python_headers():
 def gen_interop_code(members):
     """Generate the TypeOffset C# class"""
 
+    defines = [
+        "PYTHON%d%s" % (sys.version_info[:2])
+    ]
+
+    if hasattr(sys, "abiflags"):
+        if "d" in sys.abiflags:
+            defines.append("PYTHON_WITH_PYDEBUG")
+        if "m" in sys.abiflags:
+            defines.append("PYTHON_WITH_PYMALLOC")
+        if "u" in sys.abiflags:
+            defines.append("PYTHON_WITH_WIDE_UNICODE")
+
     class_definition = """
 // Auto-generated by %s.
 // DOT NOT MODIFIY BY HAND.
@@ -209,7 +221,7 @@ def gen_interop_code(members):
 // WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 // FOR A PARTICULAR PURPOSE.
 // ==========================================================================
-
+#if (%s)
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -236,7 +248,7 @@ def gen_interop_code(members):
         }
 
         // Auto-generated from PyHeapTypeObject in Python.h
-""" % os.path.basename(__file__)
+""" % (os.path.basename(__file__), " && ".join(defines))
 
     # All the members are sizeof(void*) so we don't need to do any
     # extra work to determine the size based on the type.
@@ -249,6 +261,7 @@ def gen_interop_code(members):
         public static int members = 0;
     }
 }
+#endif
 """
     return class_definition
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS`
`10`	`10`	`// FOR A PARTICULAR PURPOSE.`
`11`	`11`	`// ==========================================================================`
`12`		`-`
	`12`	`+#if (PYTHON26)`
`13`	`13`	`using System;`
`14`	`14`	`using System.Collections;`
`15`	`15`	`using System.Collections.Specialized;`
`@@ -150,3 +150,4 @@ public static int magic() {`
`150`	`150`	`public static int members = 0;`
`151`	`151`	`}`
`152`	`152`	`}`
	`153`	`+#endif`