Skip to content

fixing VS solution - compilation symbol is used for detect which interop**.cs to use #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
den-run-ai wants to merge 9 commits into from
Closed

fixing VS solution - compilation symbol is used for detect which interop**.cs to use #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
49907e8
Update Python.Runtime.csproj
Feb 27, 2016
dcb8ae7
Update geninterop.py
Feb 27, 2016
18a62cc
Update interop26.cs
Feb 27, 2016
2ce9243
Update interop27.cs
Feb 27, 2016
66f3cf0
Update interop32.cs
Feb 27, 2016
75ad704
Update interop33.cs
Feb 27, 2016
cb42e26
Update interop34.cs
Feb 27, 2016
77f4094
Update interop35.cs
Feb 27, 2016
87745a7
Update setup.py
Feb 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def build_extension(self, ext):
"/p:Platform=%s" % PLATFORM,
"/p:DefineConstants=\"%s\"" % _defines_sep.join(defines),
"/p:PythonBuildDir=\"%s\"" % os.path.abspath(dest_dir),
"/p:PythonInteropFile=\"%s\"" % os.path.basename(interop_file),
#"/p:PythonInteropFile=\"%s\"" % os.path.basename(interop_file),
"/verbosity:%s" % VERBOSITY,
]

Expand Down
59 changes: 33 additions & 26 deletions src/runtime/Python.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -9,7 +9,7 @@
<AssemblyName>Python.Runtime</AssemblyName>
<RootNamespace>Python.Runtime</RootNamespace>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
<OutputPath>bin\x86\ReleaseMono\</OutputPath>
Expand Down Expand Up @@ -84,6 +84,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
<DefineConstants>TRACE;DEBUG;PYTHON35,UCS2</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x64'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -94,27 +95,27 @@
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<Choose>
<When Condition=" '$(Configuration)'=='DebugMono' ">
<ItemGroup>
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll</HintPath>
</Reference>
</ItemGroup>
</When>
<When Condition=" '$(Configuration)'=='ReleaseMono' ">
<ItemGroup>
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll</HintPath>
</Reference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<Choose>
<When Condition=" '$(Configuration)'=='DebugMono' ">
<ItemGroup>
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll</HintPath>
</Reference>
</ItemGroup>
</When>
<When Condition=" '$(Configuration)'=='ReleaseMono' ">
<ItemGroup>
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll</HintPath>
</Reference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="arrayobject.cs" />
<Compile Include="assemblyinfo.cs" />
Expand Down Expand Up @@ -143,6 +144,12 @@
<Compile Include="interfaceobject.cs" />
<Compile Include="interfaces.cs" />
<Compile Include="interop.cs" />
<Compile Include="interop26.cs" />
<Compile Include="interop27.cs" />
<Compile Include="interop32.cs" />
<Compile Include="interop33.cs" />
<Compile Include="interop34.cs" />
<Compile Include="interop35.cs" />
<Compile Include="iterator.cs" />
<Compile Include="managedtype.cs" />
<Compile Include="metatype.cs" />
Expand Down Expand Up @@ -187,7 +194,7 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources\clr.py">
<LogicalName>clr.py</LogicalName>
<LogicalName>clr.py</LogicalName>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
Expand All @@ -199,7 +206,7 @@
<TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb>
</PropertyGroup>
<Target Name="AfterBuild">
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
</Target>
</Project>
2 changes: 2 additions & 0 deletions src/runtime/interop26.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#if (PYTHON26)
// Auto-generated by geninterop.py.
// DOT NOT MODIFIY BY HAND.
// ==========================================================================
Expand Down Expand Up @@ -150,3 +151,4 @@ public static int magic() {
public static int members = 0;
}
}
#endif
2 changes: 2 additions & 0 deletions src/runtime/interop27.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#if (PYTHON27)
// Auto-generated by geninterop.py.
// DOT NOT MODIFIY BY HAND.
// ==========================================================================
Expand Down Expand Up @@ -150,3 +151,4 @@ public static int magic() {
public static int members = 0;
}
}
#endif
2 changes: 2 additions & 0 deletions src/runtime/interop32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#if (PYTHON32)
// Auto-generated by geninterop.py.
// DOT NOT MODIFIY BY HAND.
// ==========================================================================
Expand Down Expand Up @@ -141,3 +142,4 @@ public static int magic() {
public static int members = 0;
}
}
#endif
2 changes: 2 additions & 0 deletions src/runtime/interop33.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#if (PYTHON33)
// Auto-generated by geninterop.py.
// DOT NOT MODIFIY BY HAND.
// ==========================================================================
Expand Down Expand Up @@ -143,3 +144,4 @@ public static int magic() {
public static int members = 0;
}
}
#endif
2 changes: 2 additions & 0 deletions src/runtime/interop34.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#if (PYTHON34)
// Auto-generated by geninterop.py.
// DOT NOT MODIFIY BY HAND.
// ==========================================================================
Expand Down Expand Up @@ -144,3 +145,4 @@ public static int magic() {
public static int members = 0;
}
}
#endif
2 changes: 2 additions & 0 deletions src/runtime/interop35.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#if (PYTHON35)
// Auto-generated by geninterop.py.
// DOT NOT MODIFIY BY HAND.
// ==========================================================================
Expand Down Expand Up @@ -149,3 +150,4 @@ public static int magic() {
public static int members = 0;
}
}
#endif
5 changes: 5 additions & 0 deletions tools/geninterop/geninterop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ def gen_interop_code(members):
"""Generate the TypeOffset C# class"""

class_definition = """
#if (PYTHON_VERSION)
// Auto-generated by %s.
// DOT NOT MODIFIY BY HAND.
// ==========================================================================
Expand Down Expand Up @@ -249,7 +250,11 @@ def gen_interop_code(members):
public static int members = 0;
}
}
#endif
"""
class_definition = class_definition.replace("PYTHON_VERSION",
"PYTHON" + "".join(str(_) for _
in sys.version_info[:2]))
return class_definition


Expand Down