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

Commit8151842

Browse files
authored
Add fsharp.core build to proto (#3230)
* Add fsharp.core build to proto* update linux* update linux build script
1 parent385c8a3 commit8151842

File tree

9 files changed

+21
-32
lines changed

9 files changed

+21
-32
lines changed

‎build.cmd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,8 @@ if "%BUILD_PROTO%" == "1" (
564564
pushd .\lkg\fsc&%_dotnetexe% publish project.json --no-build -o%~dp0Tools\lkg -r!_architecture!&popd&ifERRORLEVEL1echo Error: dotnet publish failed&goto :failure
565565
pushd .\lkg\fsi&%_dotnetexe% publish project.json --no-build -o%~dp0Tools\lkg -r!_architecture!&popd&ifERRORLEVEL1echo Error: dotnet publish failed&goto :failure
566566

567-
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj
568-
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj
567+
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
568+
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
569569
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
570570

571571
echo%_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
@@ -579,8 +579,8 @@ if "%BUILD_PROTO%" == "1" (
579579
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.5\tools\fsc.exe /nologo
580580
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.5\tools\fsc.exe /nologo
581581

582-
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj
583-
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj
582+
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
583+
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
584584
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
585585

586586
echo%_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ if [ "$BUILD_PROTO" = '1' ]; then
471471
# { printeval "$_ngenexe install Proto/net40/bin/fsc-proto.exe /nologo"; } || failwith "NGen of proto failed"
472472
else
473473
# Build proto-compiler and libs
474-
{ printeval"$_msbuildexe$msbuildflags src/fsharp-proto-build.proj /p:UseMonoPackaging=true"; }|| failwith"compiler proto build failed"
474+
{ printeval"$_msbuildexe$msbuildflags src/fsharp-proto-build.proj /p:UseMonoPackaging=true /p:Configuration=Proto"; }|| failwith"compiler proto build failed"
475475
fi
476476
fi
477477

‎lkg/fsc/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"emitEntryPoint":true
77
},
88
"dependencies": {
9-
"Microsoft.FSharp.Compiler.netcore":"1.0.0-rc-170122",
9+
"Microsoft.FSharp.Compiler":"4.2.0-rc-170619-0",
1010
},
1111
"runtimes": {
1212
"win7-x86": { },
@@ -25,6 +25,6 @@
2525
}
2626
},
2727
"scripts": {
28-
"postpublish": ["cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ]
28+
"postpublish": ["cmd /c copy %publish:OutputPath%\\contentFiles\\any\\any\\* %publish:OutputPath%" ]
2929
}
3030
}

‎lkg/fsi/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"emitEntryPoint":true
77
},
88
"dependencies": {
9-
"Microsoft.FSharp.Interactive.netcore":"1.0.0-rc-170122",
9+
"Microsoft.FSharp.Compiler":"4.2.0-rc-170619-0",
1010
},
1111
"runtimes": {
1212
"win7-x86": { },
@@ -25,6 +25,6 @@
2525
}
2626
},
2727
"scripts": {
28-
"postpublish": ["cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ]
28+
"postpublish": ["cmd /c copy %publish:OutputPath%\\contentFiles\\any\\any\\* %publish:OutputPath%" ]
2929
}
3030
}

‎src/FSharpSource.targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@
203203
<PropertyGroup >
204204
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin</OutputPath>
205205
<!-- When using coreclr to bootstrap to proto. We acquire the FSharp.Core LKG, targets LKG, the FSharp.Build LKG from the .NET Framework compiler tools LKG package.-->
206-
<FSharpCoreLkgPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.5\tools</FSharpCoreLkgPath>
207206
<FSharpNetCoreLkgPath>$(FSharpSourcesRoot)\..\Tools\lkg</FSharpNetCoreLkgPath>
208207
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.5\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
208+
209209
<!-- When using coreclr to bootstrap, the compiler binary comes from the coreclr LKG, invoked using corehost.exe-->
210210
<FscToolPath>$(FSharpSourcesRoot)\..\Tools\dotnetcli</FscToolPath>
211211
<FscToolExeCondition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
@@ -217,7 +217,6 @@
217217
<!-- Use .NET Framework to bootstrap to proto-->
218218
<PropertyGroup >
219219
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin</OutputPath>
220-
<FSharpCoreLkgPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.5\tools</FSharpCoreLkgPath>
221220
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.5\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
222221
</PropertyGroup>
223222
</When>

‎src/fsharp-proto-build.proj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
2-
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003"
3-
ToolsVersion="4.0">
4-
5-
<PropertyGroup>
6-
<Configuration>Proto</Configuration>
7-
</PropertyGroup>
2+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003"ToolsVersion="4.0">
83

94
<!-- Define all ProjectFiles here-->
105
<ItemGroup>
6+
<ProjectFilesInclude="fsharp\FSharp.Core\FSharp.Core.fsproj"/>
117
<ProjectFilesInclude="fsharp\FSharp.Build-proto\FSharp.Build-proto.fsproj"/>
128
<ProjectFilesInclude="fsharp\Fsc-proto\Fsc-proto.fsproj"/>
139
</ItemGroup>
1410

15-
1611
<!-- Insert any customizations for targets here-->
17-
1812
<ImportProject="root.traversal.targets"/>
1913

2014
</Project>

‎src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
</ItemGroup>
6262
<ItemGroup>
6363
<ReferenceInclude="mscorlib" />
64-
<ReferenceInclude="$(FSharpCoreLkgPath)\FSharp.Core.dll" />
6564
<ReferenceInclude="System" />
6665
<ReferenceInclude="System.Numerics" />
6766
</ItemGroup>
@@ -78,6 +77,10 @@
7877
<ReferenceInclude="Microsoft.Build.Tasks.Core, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7978
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll</HintPath>
8079
</Reference>
80+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
81+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
82+
<Name>FSharp.Core</Name>
83+
</ProjectReference>
8184
</ItemGroup>
8285
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' == 'true'">
8386
<ReferenceInclude="Microsoft.Build.Framework, Version=$(MonoPackagingMSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<PropertyGroup>
66
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
77
<ProjectLanguage>FSharp</ProjectLanguage>
8+
<BuildWithCondition=" '$(Configuration)' == 'Proto'">LKG</BuildWith>
89
</PropertyGroup>
910

1011
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />

‎src/fsharp/Fsc-proto/Fsc-proto.fsproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,6 @@
450450
</ItemGroup>
451451
<ItemGroup>
452452
<ReferenceInclude="mscorlib" />
453-
<ReferenceInclude="$(FSharpCoreLkgPath)\FSharp.Core.dll" />
454453
<ReferenceInclude="System" />
455454
<ReferenceInclude="System.Core" />
456455
<ReferenceInclude="System.Numerics" />
@@ -471,6 +470,10 @@
471470
<ReferenceInclude="System.ValueTuple">
472471
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
473472
</Reference>
473+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
474+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
475+
<Name>FSharp.Core</Name>
476+
</ProjectReference>
474477
</ItemGroup>
475478
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' != 'true'">
476479
<ReferenceInclude="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -505,15 +508,4 @@
505508
</ItemGroup>
506509
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
507510
<ImportProject="$(FsLexToolPath)\FsLexYacc.targets" />
508-
509-
<TargetName="CopyFSharpCoreOptSigFiles"AfterTargets="Build">
510-
<ItemGroup>
511-
<FSharpCoreOptSigFilesInclude="$(FSharpCoreLkgPath)\FSharp.Core.dll" />
512-
<FSharpCoreOptSigFilesInclude="$(FSharpCoreLkgPath)\FSharp.Core.optdata" />
513-
<FSharpCoreOptSigFilesInclude="$(FSharpCoreLkgPath)\FSharp.Core.sigdata" />
514-
<FSharpCoreOptSigFilesInclude="$(FSharpCoreLkgPath)\FSharp.Core.xml" />
515-
</ItemGroup>
516-
517-
<CopySourceFiles="@(FSharpCoreOptSigFiles)"DestinationFolder="$(OutputPath)" />
518-
</Target>
519511
</Project>

0 commit comments

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