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

Commit76bdeae

Browse files
committed
xbuild FSharp.Core for Mono 2.1 profile
We're gradually moving the build to xbuild, this enables the build ofFSharp.Core for Mono profile 2.1
1 parentca037f8 commit76bdeae

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

‎src/FSharpSource.targets‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- Tail calls on, even in debug-->
99
<Tailcalls>true</Tailcalls>
1010
<TargetFrameworkCondition="'$(TargetFramework)'==''">net40</TargetFramework>
11-
<!--For .NET 2.0 use a 2.0 proto compiler, otherwise use a 4.0 proto compiler-->
11+
<!--Use a 4.0 proto compiler-->
1212
<protoCLIDirCondition="'$(protoCLIDir)' == ''">net40</protoCLIDir>
1313
<LkgPath>..\lib\bootstrap\4.0</LkgPath>
1414
<FsLexUnicode>true</FsLexUnicode>
@@ -102,6 +102,19 @@
102102
<!-- MSbuild works out the assembly references-->
103103
</PropertyGroup>
104104

105+
<!-- Target MonoAndroid and MonoTouch-->
106+
<PropertyGroupCondition="'$(TargetFramework)'=='mono21'">
107+
<TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
108+
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
109+
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
110+
<DefineConstants>$(DefineConstants);FX_NO_BIGINT_CULTURE_PARSE</DefineConstants>
111+
<DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
112+
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
113+
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
114+
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
115+
<AssemblySearchPaths>/Developer/MonoAndroid/usr/lib/mono/2.1/;$(AssemblySearchPaths)</AssemblySearchPaths>
116+
</PropertyGroup>
117+
105118

106119
<!-- Target Silverlight 3.0-->
107120
<PropertyGroupCondition="'$(TargetFramework)'=='sl3'">
@@ -463,9 +476,10 @@
463476
Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
464477
Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='Proto'"/>
465478
<Error
466-
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5, sl5-compiler"
479+
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40,mono21,sl3-wp, sl5, sl5-compiler"
467480
Condition="! ('$(TargetFramework)' == 'net40' or
468481
'$(TargetFramework)' == 'net20' or
482+
'$(TargetFramework)' == 'mono21' or
469483
'$(TargetFramework)' == 'sl5' or
470484
'$(TargetFramework)' == 'sl5-compiler' or
471485
'$(TargetFramework)' == 'sl3-wp')"/>

‎src/fsharp-build.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003"ToolsVersion="4.0">
2+
23
<ItemGroup>
34
<ProjectFilesInclude="fsharp-proto-build.proj"/>
45
<ProjectFilesInclude="fsharp-library-build.proj"/>

‎src/fsharp-compiler-build.proj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
</ItemGroup>
1414

1515
<!-- Compiler: .NET 2.0 and 4.0 only-->
16-
<ItemGroupCondition=" '$(TargetFramework)' == 'net20' or
17-
'$(TargetFramework)' == 'net40' or
18-
'$(TargetFramework)' == 'mono20' or
19-
'$(TargetFramework)' == 'mono40'">
16+
<ItemGroupCondition=" '$(TargetFramework)' == 'net40'">
2017
<ProjectFilesInclude="fsharp\FSharp.Build\FSharp.Build.fsproj"/>
2118
<ProjectFilesInclude="fsharp\FSharp.Compiler\FSharp.Compiler.fsproj"/>
2219
<ProjectFilesInclude="fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj"/>

‎src/fsharp/FSharp.Core/FSharp.Core.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,17 +207,17 @@
207207
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Core.dll.fs">
208208
<Link>assemblyinfo.FSharp.Core.dll.fs</Link>
209209
</Compile>
210-
<CustomAdditionalCompileInputsInclude="Proto\%24%28protoCLIDir%29\bin\fsc-proto.exe">
210+
<CustomAdditionalCompileInputsInclude="Proto\$(protoCLIDir)\bin\fsc-proto.exe">
211211
<Visible>False</Visible>
212212
</CustomAdditionalCompileInputs>
213213
</ItemGroup>
214214
<ItemGroup>
215215
<ReferenceInclude="mscorlib" />
216216
<ReferenceInclude="System" />
217217
<ReferenceInclude="System.Numerics"Condition="'$(TargetFramework)' == 'net40'" />
218-
<ReferenceInclude="System.Net"Condition="'$(TargetFramework)' == 'sl5' OR&#xD;&#xA;'$(TargetFramework)' == 'sl5-compiler' OR&#xD;&#xA;'$(TargetFramework)' == 'XNA\5.0' OR&#xD;&#xA; '$(TargetFramework)' == 'sl3-wp'" />
218+
<ReferenceInclude="System.Net"Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl5-compiler' OR '$(TargetFramework)' == 'XNA\5.0' OR '$(TargetFramework)' == 'sl3-wp'" />
219219
<ReferenceInclude="System.Observable"Condition="'$(TargetFramework)' == 'sl3-wp'" />
220-
<ReferenceInclude="System.Core"Condition="'$(TargetFramework)' == 'sl5' OR&#xD;&#xA;'$(TargetFramework)' == 'sl5-compiler' OR&#xD;&#xA;'$(TargetFramework)' == 'XNA\5.0' OR&#xD;&#xA; '$(TargetFramework)' == 'sl3-wp'" />
220+
<ReferenceInclude="System.Core"Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl5-compiler' OR '$(TargetFramework)' == 'XNA\5.0' OR '$(TargetFramework)' == 'sl3-wp'" />
221221
</ItemGroup>
222222
<!-- References-->
223223
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />

0 commit comments

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