Changed advice to run 'python setup.py configure'

tminka · tminka · commit f82d9633bbbf · 2020-12-31T13:40:14.000Z
Python.Runtime.csproj includes all interopXX.cs files
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -19,12 +19,6 @@
     <DefineConstants>$(DefineConstants);$(ConfiguredConstants)</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
-    <Compile Remove="interop*.cs" />
-    <Compile Include="interop.cs" />
-    <Compile Include="$(PythonInteropFile)" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Remove="resources\clr.py" />
     <EmbeddedResource Include="resources\clr.py">
diff --git a/src/runtime/native/ABI.cs b/src/runtime/native/ABI.cs
@@ -25,7 +25,7 @@ internal static void Initialize(Version version, BorrowedReference pyType)
             {
                 var types = thisAssembly.GetTypes().Select(type => type.Name).Where(name => name.StartsWith("TypeOffset"));
                 string message = $"Searching for {className}, found {string.Join(",", types)}. " +
-                    "If you are building Python.NET from source, make sure you have run 'python setup.py develop' to fill in configured.props";
+                    "If you are building Python.NET from source, make sure you have run 'python setup.py configure' to fill in configured.props";
                 throw new NotSupportedException($"Python ABI v{version} is not supported: {message}");
             }
             var typeOffsets = (ITypeOffsets)Activator.CreateInstance(typeOffsetsClass);

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ internal static void Initialize(Version version, BorrowedReference pyType)`
`25`	`25`	`{`
`26`	`26`	`var types = thisAssembly.GetTypes().Select(type => type.Name).Where(name => name.StartsWith("TypeOffset"));`
`27`	`27`	`string message = $"Searching for {className}, found {string.Join(",", types)}. " +`
`28`		`- "If you are building Python.NET from source, make sure you have run 'python setup.py develop' to fill in configured.props";`
	`28`	`+ "If you are building Python.NET from source, make sure you have run 'python setup.py configure' to fill in configured.props";`
`29`	`29`	`throw new NotSupportedException($"Python ABI v{version} is not supported: {message}");`
`30`	`30`	`}`
`31`	`31`	`var typeOffsets = (ITypeOffsets)Activator.CreateInstance(typeOffsetsClass);`