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

Commitb96f64b

Browse files
committed
2 parentsaf82cbe +9da66d1 commitb96f64b

File tree

26 files changed

+425
-291
lines changed

26 files changed

+425
-291
lines changed

‎.gitignore‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,6 @@ scripts/*.patch
3535
/src/fsharp/FSharp.Compiler.Private/*.sln
3636
/src/fsharp/FSharp.Compiler.Private/*.userprefs
3737
/src/*.log
38-
/src/fsharp/FSharp.Compiler.Private/illex.fs
39-
/src/fsharp/FSharp.Compiler.Private/ilpars.fs
40-
/src/fsharp/FSharp.Compiler.Private/ilpars.fsi
41-
/src/fsharp/FSharp.Compiler.Private/lex.fs
42-
/src/fsharp/FSharp.Compiler.Private/pars.fs
43-
/src/fsharp/FSharp.Compiler.Private/pars.fsi
44-
/src/fsharp/FSharp.Compiler.Private/pplex.fs
45-
/src/fsharp/FSharp.Compiler.Private/pppars.fs
46-
/src/fsharp/FSharp.Compiler.Private/pppars.fsi
4738
/src/fsharp/Fsc-proto/illex.fs
4839
/src/fsharp/Fsc-proto/ilpars.fs
4940
/src/fsharp/Fsc-proto/ilpars.fsi

‎FSharp.sln‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,6 @@ Global
205205
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0=Release|Any CPU
206206
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg=Release|Any CPU
207207
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0=Release|Any CPU
208-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
209-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.Build.0=Debug|Any CPU
210-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.ActiveCfg=Debug|Any CPU
211-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.Build.0=Debug|Any CPU
212-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
213-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.Build.0=Proto|Any CPU
214-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.ActiveCfg=Proto|Any CPU
215-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.Build.0=Proto|Any CPU
216-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.ActiveCfg=Release|Any CPU
217-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.Build.0=Release|Any CPU
218-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.ActiveCfg=Release|Any CPU
219-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.Build.0=Release|Any CPU
220208
EndGlobalSection
221209
GlobalSection(SolutionProperties) =preSolution
222210
HideSolutionNode =FALSE
@@ -235,6 +223,5 @@ Global
235223
{88E2D422-6852-46E3-A740-83E391DC7973} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
236224
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
237225
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
238-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152} ={3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
239226
EndGlobalSection
240227
EndGlobal

‎build.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ set BUILD_PHASE=1
6060
setBUILD_NET40=0
6161
setBUILD_NET40_FSHARP_CORE=0
6262
setBUILD_CORECLR=0
63-
setBUILD_BUILDFROMSOURCE=0
63+
setBUILD_FROMSOURCE=0
6464
setBUILD_VS=0
6565
setBUILD_FCS=0
6666
setBUILD_CONFIG=release
@@ -396,7 +396,7 @@ echo BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG%
396396
echo BUILD_NET40=%BUILD_NET40%
397397
echo BUILD_NET40_FSHARP_CORE=%BUILD_NET40_FSHARP_CORE%
398398
echo BUILD_CORECLR=%BUILD_CORECLR%
399-
echoBUILD_BUILDFROMSOURCE=%BUILD_BUILDFROMSOURCE%
399+
echoBUILD_FROMSOURCE=%BUILD_FROMSOURCE%
400400
echo BUILD_VS=%BUILD_VS%
401401
echo BUILD_FCS=%BUILD_FCS%
402402
echo BUILD_SETUP=%BUILD_SETUP%

‎src/buildfromsource.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ dotnet publish %__scriptpath%buildtools\fsyacc\fsyacc.fsproj -o %__scriptpath%.
1818
ifERRORLEVEL1echo Error: failed&&goto :failure
1919

2020
rem build and pack tools
21-
dotnet restore%__scriptpath%fsharp\FSharp.Compiler.nuget\FSharp.Compiler.nuget.BuildFromSource.fsproj
21+
dotnet restore%__scriptpath%buildfromsource\FSharp.Compiler.nuget\FSharp.Compiler.nuget.fsproj
2222
ifERRORLEVEL1echo Error: failed&&goto :failure
23-
dotnet pack%__scriptpath%fsharp\FSharp.Compiler.nuget\FSharp.Compiler.nuget.BuildFromSource.fsproj -c debug
23+
dotnet pack%__scriptpath%buildfromsource\FSharp.Compiler.nuget\FSharp.Compiler.nuget.fsproj -c debug
2424
ifERRORLEVEL1echo Error: failed&&goto :failure
2525

2626
goto :success

‎src/buildfromsource.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ dotnet restore $__scriptpath/buildtools/fsyacc/fsyacc.fsproj
1111
dotnet publish$__scriptpath/buildtools/fsyacc/fsyacc.fsproj -o$__scriptpath/../Tools/fsyacc
1212

1313
# build tools
14-
dotnet restore$__scriptpath/fsharp/FSharp.Build/FSharp.Build.BuildFromSource.fsproj
15-
dotnet publish$__scriptpath/fsharp/FSharp.Build/FSharp.Build.BuildFromSource.fsproj
14+
dotnet restore$__scriptpath/buildfromsource/FSharp.Build/FSharp.Build.fsproj
15+
dotnet publish$__scriptpath/buildfromsource/FSharp.Build/FSharp.Build.fsproj
1616

17-
dotnet restore$__scriptpath/fsharp/fsi/Fsi.BuildFromSource.fsproj
18-
dotnet publishfsharp/fsi/Fsi.BuildFromSource.fsproj
17+
dotnet restore$__scriptpath/buildfromsource/Fsi/Fsi.fsproj
18+
dotnet publish$__scriptpath/buildfromsource/Fsi/Fsi.fsproj
1919

20-
dotnet restore$__scriptpath/fsharp/Fsc/Fsc.BuildFromSource.fsproj
21-
dotnet publish$__scriptpath/fsharp/Fsc/Fsc.BuildFromSource.fsproj
20+
dotnet restore$__scriptpath/buildfromsource/Fsc/Fsc.fsproj
21+
dotnet publish$__scriptpath/buildfromsource/Fsc/Fsc.fsproj
2222

2323
# build and pack tools
24-
dotnet restore$__scriptpath/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.BuildFromSource.fsproj
25-
dotnet pack$__scriptpath/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.BuildFromSource.fsproj -c release
24+
dotnet restore$__scriptpath/buildfromsource/FSharp.Compiler.nuget/FSharp.Compiler.nuget.fsproj
25+
dotnet pack$__scriptpath/buildfromsource/FSharp.Compiler.nuget/FSharp.Compiler.nuget.fsproj -c release

‎src/FSharpSource.BuildFromSource.targets‎renamed to ‎src/buildfromsource/BuildFromSource.targets‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@
44

55
<PropertyGroup>
66
<FSCoreVersion>4.4.1.0</FSCoreVersion>
7-
<OutputPath>$(MSBuildThisFileDirectory)../BuildFromSource/$(Configuration)/bin</OutputPath>
7+
<OutputPath>$(MSBuildThisFileDirectory)../../BuildFromSource/$(Configuration)/bin</OutputPath>
8+
<FSharpSourcesRoot>$(MSBuildThisFileDirectory)..</FSharpSourcesRoot>
89

910
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
1011
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1112
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1213

1314
<!-- Signing flags currently done using OtherFlags. Can migrate to properties once build target updated-->
1415
<DefineConstants>$(DefineConstants);STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY</DefineConstants>
15-
<KeyFile>$(MSBuildThisFileDirectory)buildtools/keys/MSFT.snk</KeyFile>
16+
<KeyFile>$(MSBuildThisFileDirectory)../buildtools/keys/MSFT.snk</KeyFile>
1617
<PublicSign>true</PublicSign>
1718
<OtherFlags>$(OtherFlags) --publicsign --keyfile:$(KeyFile)</OtherFlags>
1819
<OtherFlags>$(OtherFlags) --nocopyfsharpcore</OtherFlags>
1920

2021
<DotNetExeCondition=" '$(OS)' == 'Unix'">dotnet</DotNetExe>
2122
<DotNetExeCondition=" '$(OS)' != 'Unix'">dotnet.exe</DotNetExe>
22-
<DotNetExePath>$(MSBuildThisFileDirectory)../Tools/dotnet20/$(DotNetExe)</DotNetExePath>
23-
<DotNetExePathCondition="!Exists($(DotNetExe))">$(MSBuildBinPath)/../../$(DotNetExe)</DotNetExePath>
23+
<!-- When building from source, `dotnet` is expected to be on the path.-->
24+
<DotNetExePath>$(DotNetExe)</DotNetExePath>
2425

2526
<PreReleaseLabel></PreReleaseLabel>
2627
<BuildVersionFilePathCondition="'$(BuildVersionFilePath)'==''" >$(IntermediateOutputFile)\BuildVersionFile.props</BuildVersionFilePath>
@@ -32,7 +33,7 @@
3233
<TargetDotnetProfileCondition=" $(TargetFramework.StartsWith('netframework'))">net40</TargetDotnetProfile>
3334
</PropertyGroup>
3435

35-
<ImportProject="FSharpSource.Profiles.targets" />
36+
<ImportProject="..\FSharpSource.Profiles.targets" />
3637
<ImportProject="$(BuildVersionFilePath)"Condition="Exists('$(BuildVersionFilePath)')" />
3738

3839
<TargetName="CopyAndSubstituteTextFiles"
@@ -66,7 +67,7 @@
6667
Condition="'@(FsSrGen)' != ''">
6768

6869
<PropertyGroup>
69-
<FsSrGenPath>$(MSBuildThisFileDirectory)../Tools/fssrgen/fssrgen.dll</FsSrGenPath>
70+
<FsSrGenPath>$(MSBuildThisFileDirectory)../../Tools/fssrgen/fssrgen.dll</FsSrGenPath>
7071
</PropertyGroup>
7172

7273
<!-- Create the output directory in case it doesn't exist yet-->
@@ -110,7 +111,7 @@
110111
BeforeTargets="CoreCompile">
111112

112113
<PropertyGroup>
113-
<FsLexPath>$(MSBuildThisFileDirectory)../Tools/fslex/fslex.dll</FsLexPath>
114+
<FsLexPath>$(MSBuildThisFileDirectory)../../Tools/fslex/fslex.dll</FsLexPath>
114115
</PropertyGroup>
115116

116117
<!-- Create the output directory-->
@@ -133,7 +134,7 @@
133134
BeforeTargets="CoreCompile">
134135

135136
<PropertyGroup>
136-
<FsYaccPath>$(MSBuildThisFileDirectory)../Tools/fsyacc/fsyacc.dll</FsYaccPath>
137+
<FsYaccPath>$(MSBuildThisFileDirectory)../../Tools/fsyacc/fsyacc.dll</FsYaccPath>
137138
</PropertyGroup>
138139

139140
<!-- Create the output directory-->

‎src/fsharp/FSharp.Build/FSharp.Build.BuildFromSource.fsproj‎renamed to ‎src/buildfromsource/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,43 @@
1212
<OtherFlags>$(OtherFlags) --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
1313
</PropertyGroup>
1414

15-
<Import Project ="$(MSBuildThisFileDirectory)../../FSharpSource.BuildFromSource.targets" />
15+
<ImportProject="..\BuildFromSource.targets" />
1616
<ItemGroup>
17-
<FsSrGenInclude="FSBuild.txt" />
18-
<CompileInclude="InternalsVisibleTo.fs" />
17+
<FsSrGenInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSBuild.txt" />
18+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\InternalsVisibleTo.fs" />
1919
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs" />
2020
<CompileInclude="..\..\utils\CompilerLocationUtils.fs" />
2121
<CompileInclude="..\..\utils\reshapedreflection.fs" />
22-
<CompileInclude="Fsc.fsi" />
23-
<CompileInclude="Fsc.fs" />
24-
<CompileInclude="FSharpEmbedResourceText.fs" />
25-
<CompileInclude="FSharpEmbedResXSource.fs" />
26-
<CompileInclude="CreateFSharpManifestResourceName.fsi" />
27-
<CompileInclude="CreateFSharpManifestResourceName.fs" />
28-
<CopyAndSubstituteTextInclude="Microsoft.FSharp.Targets">
22+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Fsc.fsi" />
23+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Fsc.fs" />
24+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSharpEmbedResourceText.fs" />
25+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSharpEmbedResXSource.fs" />
26+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\CreateFSharpManifestResourceName.fsi" />
27+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\CreateFSharpManifestResourceName.fs" />
28+
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.Targets">
2929
<TargetFilename>Microsoft.FSharp.Targets</TargetFilename>
3030
<Pattern1>{BuildSuffix}</Pattern1>
3131
<Replacement1></Replacement1>
3232
</CopyAndSubstituteText>
33-
<CopyAndSubstituteTextInclude="Microsoft.Portable.FSharp.Targets">
33+
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.Portable.FSharp.Targets">
3434
<TargetFilename>Microsoft.Portable.FSharp.Targets</TargetFilename>
3535
<Pattern1>{BuildSuffix}</Pattern1>
3636
<Replacement1></Replacement1>
3737
</CopyAndSubstituteText>
38-
<CopyAndSubstituteTextInclude="Microsoft.FSharp.NetSdk.props">
38+
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.NetSdk.props">
3939
<TargetFilename>Microsoft.FSharp.NetSdk.props</TargetFilename>
4040
<Pattern1>{BuildSuffix}</Pattern1>
4141
<Replacement1></Replacement1>
4242
</CopyAndSubstituteText>
43-
<CopyAndSubstituteTextInclude="Microsoft.FSharp.NetSdk.targets">
43+
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.NetSdk.targets">
4444
<TargetFilename>Microsoft.FSharp.NetSdk.targets</TargetFilename>
4545
<Pattern1>{BuildSuffix}</Pattern1>
4646
<Replacement1></Replacement1>
4747
</CopyAndSubstituteText>
4848
</ItemGroup>
4949

5050
<ItemGroup>
51-
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.BuildFromSource.fsproj" />
51+
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
5252
<PackageReferenceInclude="Microsoft.Build"Version="15.1.548"></PackageReference>
5353
<PackageReferenceInclude="Microsoft.Build.Framework"Version="15.1.548"></PackageReference>
5454
<PackageReferenceInclude="Microsoft.Build.Tasks.Core"Version="15.1.548"></PackageReference>
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
<OtherFlags>$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
1414
</PropertyGroup>
1515

16-
<Import Project ="$(MSBuildThisFileDirectory)..\..\FSharpSource.BuildFromSource.targets" />
16+
<ImportProject="..\BuildFromSource.targets" />
1717
<ItemGroup>
18-
<FsSrGenInclude="..\FSInteractiveSettings.txt" />
19-
<CompileInclude="InternalsVisibleTo.fs" />
18+
<FsSrGenInclude="$(FSharpSourcesRoot)\fsharp\FSInteractiveSettings.txt" />
19+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\InternalsVisibleTo.fs" />
2020
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs" />
2121
<CompileInclude="..\..\utils\reshapedreflection.fs" />
22-
<CompileInclude="..\fsiattrs.fs" />
23-
<CompileInclude="..\fsiaux.fsi" />
24-
<CompileInclude="..\fsiaux.fs" />
22+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\fsiattrs.fs" />
23+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\fsiaux.fsi" />
24+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\fsiaux.fs" />
2525
</ItemGroup>
2626

2727

2828
<ItemGroup>
29-
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.BuildFromSource.fsproj" />
29+
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
3030
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="4.3.0"></PackageReference>
3131
</ItemGroup>
3232

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
illex.fs
2+
ilpars.fs
3+
ilpars.fsi
4+
lex.fs
5+
pars.fs
6+
pars.fsi
7+
pplex.fs
8+
pppars.fs
9+
pppars.fsi

0 commit comments

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