FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Refactor property conditions · ayuretsky/pythonnet@15cd373 · GitHub

  1. ayuretsky
  2. pythonnet

Repository navigation

Commit 15cd373

Browse files
vmuriart
committed
Refactor property conditions
1 parent 5844bee commit 15cd373

5 files changed

Lines changed: 75 additions & 385 deletions

File tree

‎src/clrmodule/clrmodule.csproj‎

Lines changed: 16 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -17,116 +17,58 @@
1717
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1818
<RestorePackages>true</RestorePackages>
1919
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x86'">
21-
<DebugSymbols>true</DebugSymbols>
22-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
23-
<DebugType>full</DebugType>
20+
<PropertyGroup Condition=" '$(Platform)' == 'x86'">
2421
<PlatformTarget>x86</PlatformTarget>
25-
<ErrorReport>prompt</ErrorReport>
2622
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x64'">
28-
<DebugSymbols>true</DebugSymbols>
29-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
30-
<DebugType>full</DebugType>
23+
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
3124
<PlatformTarget>x64</PlatformTarget>
32-
<ErrorReport>prompt</ErrorReport>
3325
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
35-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
36-
<Optimize>true</Optimize>
37-
<DebugType>pdbonly</DebugType>
38-
<PlatformTarget>x86</PlatformTarget>
26+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
27+
<DebugSymbols>true</DebugSymbols>
28+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;TRACE;DEBUG</DefineConstants>
29+
<DebugType>full</DebugType>
3930
<ErrorReport>prompt</ErrorReport>
4031
</PropertyGroup>
41-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
32+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
4233
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
4334
<Optimize>true</Optimize>
4435
<DebugType>pdbonly</DebugType>
45-
<PlatformTarget>x64</PlatformTarget>
4636
<ErrorReport>prompt</ErrorReport>
4737
</PropertyGroup>
48-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86'">
38+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
4939
<DebugSymbols>true</DebugSymbols>
50-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
40+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;TRACE;DEBUG</DefineConstants>
5141
<DebugType>full</DebugType>
52-
<PlatformTarget>x86</PlatformTarget>
5342
<ErrorReport>prompt</ErrorReport>
5443
</PropertyGroup>
55-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x64'">
56-
<DebugSymbols>true</DebugSymbols>
57-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
58-
<DebugType>full</DebugType>
59-
<PlatformTarget>x64</PlatformTarget>
60-
<ErrorReport>prompt</ErrorReport>
61-
</PropertyGroup>
62-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
44+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
6345
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
6446
<Optimize>true</Optimize>
6547
<DebugType>pdbonly</DebugType>
66-
<PlatformTarget>x86</PlatformTarget>
67-
<ErrorReport>prompt</ErrorReport>
68-
</PropertyGroup>
69-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
70-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
71-
<Optimize>true</Optimize>
72-
<DebugType>pdbonly</DebugType>
73-
<PlatformTarget>x64</PlatformTarget>
7448
<ErrorReport>prompt</ErrorReport>
7549
</PropertyGroup>
76-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
50+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
7751
<DebugSymbols>true</DebugSymbols>
78-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
52+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;TRACE;DEBUG</DefineConstants>
7953
<DebugType>full</DebugType>
80-
<PlatformTarget>x86</PlatformTarget>
8154
<ErrorReport>prompt</ErrorReport>
8255
</PropertyGroup>
83-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
84-
<DebugSymbols>true</DebugSymbols>
85-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
86-
<DebugType>full</DebugType>
87-
<PlatformTarget>x64</PlatformTarget>
88-
<ErrorReport>prompt</ErrorReport>
89-
</PropertyGroup>
90-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
56+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
9157
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
9258
<Optimize>true</Optimize>
9359
<DebugType>pdbonly</DebugType>
94-
<PlatformTarget>x86</PlatformTarget>
95-
<ErrorReport>prompt</ErrorReport>
96-
</PropertyGroup>
97-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
98-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
99-
<Optimize>true</Optimize>
100-
<DebugType>pdbonly</DebugType>
101-
<PlatformTarget>x64</PlatformTarget>
10260
<ErrorReport>prompt</ErrorReport>
10361
</PropertyGroup>
104-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
62+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
10563
<DebugSymbols>true</DebugSymbols>
106-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
64+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;TRACE;DEBUG</DefineConstants>
10765
<DebugType>full</DebugType>
108-
<PlatformTarget>x86</PlatformTarget>
10966
<ErrorReport>prompt</ErrorReport>
11067
</PropertyGroup>
111-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
112-
<DebugSymbols>true</DebugSymbols>
113-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
114-
<DebugType>full</DebugType>
115-
<PlatformTarget>x64</PlatformTarget>
116-
<ErrorReport>prompt</ErrorReport>
117-
</PropertyGroup>
118-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
68+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
11969
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
12070
<Optimize>true</Optimize>
12171
<DebugType>pdbonly</DebugType>
122-
<PlatformTarget>x86</PlatformTarget>
123-
<ErrorReport>prompt</ErrorReport>
124-
</PropertyGroup>
125-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
126-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
127-
<Optimize>true</Optimize>
128-
<DebugType>pdbonly</DebugType>
129-
<PlatformTarget>x64</PlatformTarget>
13072
<ErrorReport>prompt</ErrorReport>
13173
</PropertyGroup>
13274
<ItemGroup>

‎src/console/Console.csproj‎

Lines changed: 16 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -17,124 +17,58 @@
1717
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1818
<ApplicationIcon>python-clear.ico</ApplicationIcon>
1919
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x86'">
21-
<DebugSymbols>true</DebugSymbols>
22-
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
23-
<DebugType>full</DebugType>
20+
<PropertyGroup Condition=" '$(Platform)' == 'x86'">
2421
<PlatformTarget>x86</PlatformTarget>
25-
<ErrorReport>prompt</ErrorReport>
2622
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x64'">
23+
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
24+
<PlatformTarget>x64</PlatformTarget>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
2827
<DebugSymbols>true</DebugSymbols>
2928
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
3029
<DebugType>full</DebugType>
31-
<PlatformTarget>x64</PlatformTarget>
3230
<ErrorReport>prompt</ErrorReport>
3331
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
35-
<DefineConstants Condition="'$(DefineConstants)' == ''">
36-
</DefineConstants>
32+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
33+
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
3734
<Optimize>true</Optimize>
3835
<DebugType>pdbonly</DebugType>
39-
<PlatformTarget>x86</PlatformTarget>
40-
<ErrorReport>prompt</ErrorReport>
41-
</PropertyGroup>
42-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
43-
<DefineConstants Condition="'$(DefineConstants)' == ''">
44-
</DefineConstants>
45-
<Optimize>true</Optimize>
46-
<DebugType>pdbonly</DebugType>
47-
<PlatformTarget>x64</PlatformTarget>
4836
<ErrorReport>prompt</ErrorReport>
4937
</PropertyGroup>
50-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86'">
38+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
5139
<DebugSymbols>true</DebugSymbols>
5240
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
5341
<DebugType>full</DebugType>
54-
<PlatformTarget>x86</PlatformTarget>
55-
<ErrorReport>prompt</ErrorReport>
56-
</PropertyGroup>
57-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x64'">
58-
<DebugSymbols>true</DebugSymbols>
59-
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
60-
<DebugType>full</DebugType>
61-
<PlatformTarget>x64</PlatformTarget>
6242
<ErrorReport>prompt</ErrorReport>
6343
</PropertyGroup>
64-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
65-
<DefineConstants Condition="'$(DefineConstants)' == ''">
66-
</DefineConstants>
44+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
45+
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
6746
<Optimize>true</Optimize>
6847
<DebugType>pdbonly</DebugType>
69-
<PlatformTarget>x86</PlatformTarget>
70-
<ErrorReport>prompt</ErrorReport>
71-
</PropertyGroup>
72-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
73-
<DefineConstants Condition="'$(DefineConstants)' == ''">
74-
</DefineConstants>
75-
<Optimize>true</Optimize>
76-
<DebugType>pdbonly</DebugType>
77-
<PlatformTarget>x64</PlatformTarget>
7848
<ErrorReport>prompt</ErrorReport>
7949
</PropertyGroup>
80-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
50+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
8151
<DebugSymbols>true</DebugSymbols>
8252
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
8353
<DebugType>full</DebugType>
84-
<PlatformTarget>x86</PlatformTarget>
85-
<ErrorReport>prompt</ErrorReport>
86-
</PropertyGroup>
87-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
88-
<DebugSymbols>true</DebugSymbols>
89-
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
90-
<DebugType>full</DebugType>
91-
<PlatformTarget>x64</PlatformTarget>
9254
<ErrorReport>prompt</ErrorReport>
9355
</PropertyGroup>
94-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
95-
<DefineConstants Condition="'$(DefineConstants)' == ''">
96-
</DefineConstants>
56+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
57+
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
9758
<Optimize>true</Optimize>
9859
<DebugType>pdbonly</DebugType>
99-
<PlatformTarget>x86</PlatformTarget>
100-
<ErrorReport>prompt</ErrorReport>
101-
</PropertyGroup>
102-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
103-
<DefineConstants Condition="'$(DefineConstants)' == ''">
104-
</DefineConstants>
105-
<Optimize>true</Optimize>
106-
<DebugType>pdbonly</DebugType>
107-
<PlatformTarget>x64</PlatformTarget>
10860
<ErrorReport>prompt</ErrorReport>
10961
</PropertyGroup>
110-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
62+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
11163
<DebugSymbols>true</DebugSymbols>
11264
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
11365
<DebugType>full</DebugType>
114-
<PlatformTarget>x86</PlatformTarget>
115-
<ErrorReport>prompt</ErrorReport>
116-
</PropertyGroup>
117-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
118-
<DebugSymbols>true</DebugSymbols>
119-
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
120-
<DebugType>full</DebugType>
121-
<PlatformTarget>x64</PlatformTarget>
12266
<ErrorReport>prompt</ErrorReport>
12367
</PropertyGroup>
124-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
125-
<DefineConstants Condition="'$(DefineConstants)' == ''">
126-
</DefineConstants>
68+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
69+
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
12770
<Optimize>true</Optimize>
12871
<DebugType>pdbonly</DebugType>
129-
<PlatformTarget>x86</PlatformTarget>
130-
<ErrorReport>prompt</ErrorReport>
131-
</PropertyGroup>
132-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
133-
<DefineConstants Condition="'$(DefineConstants)' == ''">
134-
</DefineConstants>
135-
<Optimize>true</Optimize>
136-
<DebugType>pdbonly</DebugType>
137-
<PlatformTarget>x64</PlatformTarget>
13872
<ErrorReport>prompt</ErrorReport>
13973
</PropertyGroup>
14074
<PropertyGroup Condition="'$(PythonManifest)' != ''">

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL