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

Commiteff5040

Browse files
forkiunknown
authored and
unknown
committed
Remove sl5-compiler build option
1 parente5d3975 commiteff5040

File tree

6 files changed

+7
-521
lines changed

6 files changed

+7
-521
lines changed

‎DEVGUIDE.html‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -472,21 +472,6 @@ <h3>7. Verify the optimised F# compiler build with simple smoke test</h3>
472472
<h3>8. [Optional] Open a solution with Visual Studio</h3>
473473

474474
<p> You can use "fsharp.sln" to browse source code using Visual Studio. However, you need to complete step 1) and 2) in order to properly open this solution. In addition, FSharp.Core.Unittests project requires NUnit installed.</p>
475-
476-
<h3>9. [Optional] Build a compiler component for hosting in the browser with Silverlight</h3>
477-
478-
<p> This builds FSharp.Compiler.Silverlight.dll which is a Silverlight 5.0 component for hosting in the browser. You must have Silverlight5 installed.</p>
479-
<li>This places the binaries in Debug\sl5-compiler:</il>
480-
<pre>
481-
msbuild fsharp-library-build.proj /p:TargetFramework=sl5-compiler
482-
msbuild fsharp-compiler-build.proj /p:TargetFramework=sl5-compiler</pre>
483-
484-
<li>This places the binaries in Release\sl5-compiler:</li>
485-
<pre>
486-
msbuild fsharp-library-build.proj /p:TargetFramework=sl5-compiler /p:Configuration=Release
487-
msbuild fsharp-compiler-build.proj /p:TargetFramework=sl5-compiler /p:Configuration=Release</pre>
488-
489-
<p> A custom FSharp.Core.dll is used for this configuration, be sure to reference it rather than any other FSharp.Core.dll for Silverlight. You may have to edit your project file by hand to ensure you get exactly the right reference to FSharp.Core.dll.</p>
490475
<br>
491476

492477
</body>

‎src/FSharpSource.targets‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@
244244
</PropertyGroup>
245245

246246
<!-- Target Silverlight 5.0-->
247-
<PropertyGroupCondition="'$(TargetFramework)'=='sl5' OR
248-
'$(TargetFramework)'=='sl5-compiler'">
247+
<PropertyGroupCondition="'$(TargetFramework)'=='sl5'">
249248
<DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>
250249
<DefineConstants>$(DefineConstants);FX_ATLEAST_SILVERLIGHT_50</DefineConstants>
251250
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
@@ -493,7 +492,7 @@
493492
<FSharpTargetsPath>..\Proto\$(protoCLIDir)\bin\Microsoft.Portable.FSharp-proto.Targets</FSharpTargetsPath>
494493
</PropertyGroup>
495494
</When>
496-
<WhenCondition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5' or '$(TargetFramework)'=='sl5-compiler'">
495+
<WhenCondition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5'">
497496
<PropertyGroup>
498497
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\Silverlight\$(SilverlightVersion)\FSharpSource.Silverlight.Common.targets</FSharpTargetsPath>
499498
</PropertyGroup>
@@ -554,11 +553,10 @@
554553
Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
555554
Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='Proto'"/>
556555
<Error
557-
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5,sl5-compiler,portable47"
556+
Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5, portable47"
558557
Condition="! ('$(TargetFramework)' == 'net40' or
559558
'$(TargetFramework)' == 'net20' or
560559
'$(TargetFramework)' == 'sl5' or
561-
'$(TargetFramework)' == 'sl5-compiler' or
562560
'$(TargetFramework)' == 'sl3-wp' or
563561
'$(TargetFramework)' == 'portable47')"/>
564562
<Error

‎src/fsharp-compiler-build.proj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<TargetFrameworkCondition="'$(TargetFramework)'==''">net40</TargetFramework>
55
</PropertyGroup>
6-
<ItemGroupCondition=" '$(TargetFramework)' == 'sl5-compiler'">
7-
<ProjectFilesInclude="fsharp\FSharp.Compiler.Silverlight\FSharp.Compiler.Silverlight.fsproj"/>
8-
</ItemGroup>
96

107
<!-- Compiler: .NET 2.0 and 4.0 only-->
118
<ItemGroupCondition=" '$(TargetFramework)' == 'net20' or

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp