8000 PYTHONNET_PY3_VERSION, PYTHONNET_PY2_VERSION build related environmen… · yagweb/pythonnet@966f035 · GitHub
[go: up one dir, main page]
Skip to content

Commit 966f035

Browse files
author
dse
committed
PYTHONNET_PY3_VERSION, PYTHONNET_PY2_VERSION build related environment vars introduced.
1 parent ed48618 commit 966f035

File tree

1 file changed

+12
-8
lines changed
< 10000 div class="d-flex flex-nowrap gap-2">

1 file changed

+12
-8
lines changed

‎src/runtime/Python.Runtime.15.csproj

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,49 +29,53 @@
2929
<DefineConstants>$(DefineConstants);$(CustomDefineConstants);$(BaseDefineConstants);</DefineConstants>
3030
<DefineConstants Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>
3131
<FrameworkPathOverride Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>
32+
<Python2Version>$(PYTHONNET_PY2_VERSION)</Python2Version>
33+
<Python2Version Condition="'$(Python2Version)'==''">PYTHON27</Python2Version>
34+
<Python3Version>$(PYTHONNET_PY3_VERSION)</Python3Version>
35+
<Python3Version Condition="'$(Python3Version)'==''">PYTHON36</Python3Version>
3236
</PropertyGroup>
3337

3438
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
35-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS4</DefineConstants>
39+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS4</DefineConstants>
3640
<Optimize>true</Optimize>
3741
<DebugType>pdbonly</DebugType>
3842
</PropertyGroup>
3943
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
40-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS4</DefineConstants>
44+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS4</DefineConstants>
4145
<Optimize>true</Optimize>
4246
<DebugType>pdbonly</DebugType>
4347
</PropertyGroup>
4448
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
4549
<DebugSymbols>true</DebugSymbols>
46-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS4;TRACE;DEBUG</DefineConstants>
50+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS4;TRACE;DEBUG</DefineConstants>
4751
<Optimize>false</Optimize>
4852
<DebugType>full</DebugType>
4953
</PropertyGroup>
5054
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
5155
<DebugSymbols>true</DebugSymbols>
52-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS4;TRACE;DEBUG</DefineConstants>
56+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS4;TRACE;DEBUG</DefineConstants>
5357
<Optimize>false</Optimize>
5458
<DebugType>full</DebugType>
5559
</PropertyGroup>
5660
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
57-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS2</DefineConstants>
61+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS2</DefineConstants>
5862
<Optimize>true</Optimize>
5963
<DebugType>pdbonly</DebugType>
6064
</PropertyGroup>
6165
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
62-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS2</DefineConstants>
66+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS2</DefineConstants>
6367
<Optimize>true</Optimize>
6468
<DebugType>pdbonly</DebugType>
6569
</PropertyGroup>
6670
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
6771
<DebugSymbols>true</DebugSymbols>
68-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS2;TRACE;DEBUG</DefineConstants>
72+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS2;TRACE;DEBUG</DefineConstants>
6973
<Optimize>false</Optimize>
7074
<DebugType>full</DebugType>
7175
</PropertyGroup>
7276
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
7377
<DebugSymbols>true</DebugSymbols>
74-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS2;TRACE;DEBUG</DefineConstants>
78+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS2;TRACE;DEBUG</DefineConstants>
7579
<Optimize>false</Optimize>
7680
<DebugType>full</DebugType>
7781
</PropertyGroup>

0 commit comments

Comments
 (0)
0