Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit47a3284

Browse files
committed
Fix build on windows to put binaries in same places as build on unix
Binaries built by msbuildd and xbuild now go inlib/release/4.0/...etc. as described in the README
1 parente3d597d commit47a3284

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

‎src/FSharpSource.targets‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Tailcalls>true</Tailcalls>
1010
<TargetFrameworkCondition="'$(TargetFramework)'==''">net40</TargetFramework>
1111
<!-- Use a 4.0 proto compiler-->
12-
<protoCLIDirCondition="'$(protoCLIDir)' == ''">net40</protoCLIDir>
12+
<protoCLIDir>4.0</protoCLIDir>
1313
<LkgPath>$(FSharpSourcesRoot)\..\lib\bootstrap\4.0</LkgPath>
1414
<FsLexUnicode>true</FsLexUnicode>
1515
<ProjectLanguage>FSharp</ProjectLanguage>
@@ -54,20 +54,23 @@
5454
<PropertyGroupCondition="'$(Configuration)'=='Debug'">
5555
<DefineConstants>DEBUG; $(DefineConstants)</DefineConstants>
5656
<Optimize>false</Optimize>
57+
<ConfigurationOutputDirectory>debug</ConfigurationOutputDirectory>
5758
<!-- These flags provide a better debugging experience. Locals should be visible.-->
5859
<OtherFlags>$(OtherFlags) --no-jit-optimize --jit-tracking</OtherFlags>
5960
<DefineConstants>CODE_ANALYSIS; $(DefineConstants)</DefineConstants>
6061
</PropertyGroup>
6162

6263
<PropertyGroupCondition="'$(Configuration)'=='Release'">
6364
<Optimize>true</Optimize>
65+
<ConfigurationOutputDirectory>release</ConfigurationOutputDirectory>
6466
</PropertyGroup>
6567

6668
<!-- Flags used to build the bootstrap compiler.
6769
-->
6870
<PropertyGroupCondition="'$(Configuration)'=='Proto'">
6971
<Optimize>true</Optimize>
7072
<DefineConstants>DEBUG;NO_STRONG_NAMES;$(DefineConstants)</DefineConstants>
73+
<ConfigurationOutputDirectory>proto</ConfigurationOutputDirectory>
7174
</PropertyGroup>
7275

7376
<PropertyGroup>
@@ -76,13 +79,14 @@
7679

7780
<!-- Always qualify the IntermediateOutputPath by the TargetFramework if any exists-->
7881
<PropertyGroup>
79-
<IntermediateOutputPath>obj\$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
82+
<IntermediateOutputPath>obj\$(ConfigurationOutputDirectory)\$(TargetFramework)\</IntermediateOutputPath>
8083
</PropertyGroup>
8184

8285
<!-- v2.0-specific flags-->
83-
<PropertyGroupCondition="'$(TargetFramework)'=='net20' or '$(TargetFramework)'=='mono20'">
86+
<PropertyGroupCondition="'$(TargetFramework)'=='net20'">
8487
<!-- If 3.5 is not configured explicitly, use 2.0-->
8588
<TargetFrameworkVersionCondition="'$(TargetFrameworkVersion)'==''">v2.0</TargetFrameworkVersion>
89+
<TargetFrameworkVersionShort>2.0</TargetFrameworkVersionShort>
8690
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
8791
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
8892
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
@@ -98,6 +102,7 @@
98102

99103
<PropertyGroupCondition="'$(TargetFramework)'=='net40'">
100104
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
105+
<TargetFrameworkVersionShort>4.0</TargetFrameworkVersionShort>
101106
<DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
102107
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
103108
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
@@ -112,20 +117,22 @@
112117
<!-- Target MonoAndroid and MonoTouch-->
113118
<PropertyGroupCondition="'$(TargetFramework)'=='mono21'">
114119
<TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
120+
<TargetFrameworkVersionShort>2.1</TargetFrameworkVersionShort>
115121
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
116122
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
117123
<DefineConstants>$(DefineConstants);FX_NO_BIGINT_CULTURE_PARSE</DefineConstants>
118124
<DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
119125
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
120126
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
121127
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
122-
<AssemblySearchPaths>/Developer/MonoAndroid/usr/lib/mono/2.1/;$(AssemblySearchPaths)</AssemblySearchPaths>
128+
<AssemblySearchPaths>$(FSharpSourcesRoot)\..\dependencies\mono\2.1;$(AssemblySearchPaths)</AssemblySearchPaths>
123129
</PropertyGroup>
124130

125131

126132
<!-- Target Silverlight 3.0-->
127133
<PropertyGroupCondition="'$(TargetFramework)'=='sl3'">
128134
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
135+
<TargetFrameworkVersionShort>sl3</TargetFrameworkVersionShort>
129136
<DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>
130137
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
131138
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
@@ -204,6 +211,7 @@
204211
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
205212
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
206213
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
214+
<TargetFrameworkVersionShort>sl4</TargetFrameworkVersionShort>
207215
<SilverlightVersion>v4.0</SilverlightVersion>
208216
</PropertyGroup>
209217

@@ -249,6 +257,7 @@
249257
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
250258
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
251259
<SilverlightVersion>v5.0</SilverlightVersion>
260+
<TargetFrameworkVersionShort>$(TargetFramework)</TargetFrameworkVersionShort>
252261
<FrameworkRegistryBase>Software\Microsoft\Microsoft SDKs\$(TargetFrameworkIdentifier)</FrameworkRegistryBase>
253262
<AssemblySearchPaths>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0</AssemblySearchPaths>
254263
</PropertyGroup>
@@ -295,6 +304,7 @@
295304
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
296305
<Tailcalls>false</Tailcalls>
297306
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
307+
<TargetFrameworkVersionShort>$(TargetFramework)</TargetFrameworkVersionShort>
298308
<!-- It would be better to use MSBuild resolution here, but the TargetFrameworkIdentifier etc. aren't set up quite correctly as yet-->
299309
<OtherFlags>$(OtherFlags) --simpleresolution -r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\mscorlib.dll" </OtherFlags>
300310
</PropertyGroup>
@@ -345,6 +355,7 @@
345355
<DefineConstants>$(DefineConstants);FX_NO_TUPLE</DefineConstants>
346356
<DefineConstants>$(DefineConstants);FX_NO_DELEGATE_CREATE_DELEGATE_FROM_STATIC_METHOD</DefineConstants>
347357
<DefineConstants>$(DefineConstants)</DefineConstants>
358+
<TargetFrameworkVersionShort>$(TargetFramework)</TargetFrameworkVersionShort>
348359
<!-- It would be better to use MSBuild resolution here, but the TargetFrameworkIdentifier etc. aren't set up quite correctly as yet-->
349360
<OtherFlags>$(OtherFlags) --simpleresolution -r:"C:\Program Files\Microsoft.NET\SDK\CompactFramework\v2.0\WindowsCE\mscorlib.dll" -r:"C:\Program Files\Microsoft.NET\SDK\CompactFramework\v2.0\WindowsCE\System.dll"</OtherFlags>
350361
</PropertyGroup>
@@ -389,6 +400,7 @@
389400
<!-- Target CompactFramework 3.5-->
390401
<PropertyGroupCondition="'$(TargetFramework)'=='net35-cf'">
391402
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
403+
<TargetFrameworkVersionShort>3.5</TargetFrameworkVersionShort>
392404
<TargetFrameworkIdentifier>CompactFramework</TargetFrameworkIdentifier>
393405
<DefineConstants>$(DefineConstants);FX_ATLEAST_COMPACT_FRAMEWORK_35</DefineConstants>
394406
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
@@ -439,27 +451,25 @@
439451
<!-- Build with LKG compiler (location is determined by Microsoft.FSharp.targets). The output compiler has suffix "-proto"-->
440452
<PropertyGroupCondition=" '$(BuildWith)' == 'LKG' And '$(ProjectLanguage)' == 'FSharp'">
441453
<FsBuildSuffix>-proto</FsBuildSuffix>
442-
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(protoCLIDir)\bin</OutputPath>
454+
<OutputPath>$(FSharpSourcesRoot)\..\lib\$(ConfigurationOutputDirectory)\$(TargetFrameworkVersionShort)</OutputPath>
443455
</PropertyGroup>
444456

445457
<!-- Build with prototype compiler (location is given by settings below). The output is the final bootstrapped compiler-->
446458
<PropertyGroupCondition=" '$(BuildWith)' == ''">
447-
<FSharpTargetsDir>$(FSharpSourcesRoot)\..\Proto\$(protoCLIDir)\bin</FSharpTargetsDir>
448-
449-
<FscToolPath>$(FSharpSourcesRoot)\..\Proto\$(protoCLIDir)\bin</FscToolPath>
459+
<FscToolPath>$(FSharpSourcesRoot)\..\lib\proto\$(protoCLIDir)</FscToolPath>
450460
<FscToolExe>fsc-proto.exe</FscToolExe>
451-
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</OutputPath>
461+
<OutputPath>$(FSharpSourcesRoot)\..\lib\$(ConfigurationOutputDirectory)\$(TargetFrameworkVersionShort)</OutputPath>
452462
</PropertyGroup>
453463

454464

455465

456466
<!-- Include the proto targets file when building the final compiler suing the proto-->
457-
<ImportProject="..\Proto\$(protoCLIDir)\bin\Microsoft.FSharp-proto.targets"
458-
Condition="Exists('..\Proto\$(protoCLIDir)\bin\Microsoft.FSharp-proto.targets') AND '$(BuildWith)' == '' AND '$(ProjectLanguage)' == 'FSharp'"/>
467+
<ImportProject="..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets"
468+
Condition="Exists('..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets') AND '$(BuildWith)' == '' AND '$(ProjectLanguage)' == 'FSharp'"/>
459469
<!-- Include the bootstrap targets file when building the proto compiler using the bootstrap-->
460470
<!-- Also include it if Proto targets file doesn't exist, e.g. when cleaning the build with /t:Clean-->
461471
<ImportProject="$(LkgPath)\Microsoft.FSharp.targets"
462-
Condition="(!Exists('..\Proto\$(protoCLIDir)\bin\Microsoft.FSharp-proto.targets') OR '$(BuildWith)' == 'LKG') AND '$(ProjectLanguage)' == 'FSharp'" />
472+
Condition="(!Exists('..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets') OR '$(BuildWith)' == 'LKG') AND '$(ProjectLanguage)' == 'FSharp'" />
463473
<ImportProject="Silverlight\$(SilverlightVersion)\FSharpSource.Silverlight.Common.targets"
464474
Condition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5' or '$(TargetFramework)'=='sl5-compiler'"/>
465475

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp