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

Commit458e6c2

Browse files
authored
Merge pull request #3089 from dsyme/converge
And then there were two compiler DLLs
2 parentsba63403 +50a4575 commit458e6c2

File tree

100 files changed

+1637
-2566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1637
-2566
lines changed

‎FSharp.sln‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion =15.0.26403.7
55
MinimumVisualStudioVersion =10.0.40219.1
6-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler","src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
6+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Private","src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
88
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Server.Shared","src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj","{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}"
99
EndProject
@@ -43,8 +43,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HostedCompilerServer", "tes
4343
EndProject
4444
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ILComparer","tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj","{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
4545
EndProject
46-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.LanguageService.Compiler","src\fsharp\FSharp.LanguageService.Compiler\FSharp.LanguageService.Compiler.fsproj","{A437A6EC-5323-47C2-8F86-E2CAC54FF152}"
47-
EndProject
4846
Global
4947
GlobalSection(SolutionConfigurationPlatforms) =preSolution
5048
Debug|Any CPU=Debug|Any CPU

‎Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ all:
1515

1616
build-proto: restore
1717
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
18-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
1918
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/Fsc-proto/Fsc-proto.fsproj
2019

2120
# The main targets
2221
build:
2322
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
2423
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
25-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
24+
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
2625
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
2726
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
2827
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
@@ -68,15 +67,15 @@ install:
6867
-rm -fr$(DESTDIR)$(monodir)/Microsoft\F#
6968
-rm -fr$(DESTDIR)$(monodir)/Microsoft\SDKs/F#
7069
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Core
71-
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler
70+
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private
7271
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp
7372
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp
7473
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp
7574
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp
7675
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp
7776
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 install
7877
$(MAKE) -C mono/FSharp.Build install
79-
$(MAKE) -C mono/FSharp.Compiler install
78+
$(MAKE) -C mono/FSharp.Compiler.Private install
8079
$(MAKE) -C mono/Fsc install
8180
$(MAKE) -C mono/FSharp.Compiler.Interactive.Settings install
8281
$(MAKE) -C mono/FSharp.Compiler.Server.Shared install

‎VisualFSharp.sln‎

Lines changed: 713 additions & 728 deletions
Large diffs are not rendered by default.

‎build-everything.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroupCondition="'$(BUILD_NET40)'=='1'">
1111
<ProjectsWithNet40Include="src/fsharp/FSharp.Build/FSharp.Build.fsproj" />
12-
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj" />
12+
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj" />
1313
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj"/>
1414
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
1515
<ProjectsWithNet40Include="src/fsharp/Fsc/Fsc.fsproj" />
@@ -20,7 +20,7 @@
2020
<ItemGroupCondition="'$(BUILD_CORECLR)'=='1'">
2121
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Core/FSharp.Core.fsproj" />
2222
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Build/FSharp.Build.fsproj" />
23-
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj" />
23+
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj" />
2424
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
2525
<ProjectsWithCoreClrInclude="src/fsharp/Fsc/Fsc.fsproj" />
2626
<ProjectsWithCoreClrInclude="src/fsharp/fsi/Fsi.fsproj" />

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
2525
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
2626
<DefineConstants>$(DefineConstants);COMPILER_PUBLIC_API</DefineConstants>
27-
<DefineConstants>$(DefineConstants);COMPILER_SERVICE</DefineConstants>
28-
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_DLL</DefineConstants>
2927
<DefineConstants>$(DefineConstants);NO_STRONG_NAMES</DefineConstants>
3028
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
3129
<TargetFrameworkProfile />
@@ -585,6 +583,7 @@
585583
<CompileInclude="$(FSharpSourcesRoot)\fsharp\fsi\fsi.fs">
586584
<Link>Service/fsi.fs</Link>
587585
</Compile>
586+
588587
</ItemGroup>
589588
<ItemGroup>
590589
<ReferenceInclude="mscorlib" />
@@ -604,6 +603,10 @@
604603
<ReferenceInclude="System.Collections.Immutable">
605604
<HintPath>$(FSharpSourcesRoot)\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
606605
</Reference>
606+
<ReferenceInclude="System.ValueTuple">
607+
<HintPath>$(FSharpSourcesRoot)\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
608+
<Private>true</Private>
609+
</Reference>
607610
</ItemGroup>
608611

609612
<ItemGroup>

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
<DefineConstants>$(DefineConstants);BUILDING_WITH_LKG</DefineConstants>
77
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
88
<DefineConstants>$(DefineConstants);COMPILER_PUBLIC_API</DefineConstants>
9-
<DefineConstants>$(DefineConstants);COMPILER_SERVICE</DefineConstants>
10-
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_DLL</DefineConstants>
9+
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_ASSUMES_DOTNETCORE_COMPILATION</DefineConstants>
1110
<DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
1211
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
1312
<DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
@@ -47,11 +46,7 @@
4746
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
4847
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION_CORECLR</DefineConstants>
4948
<DefineConstants>$(DefineConstants);FSI_TODO_NETCORE</DefineConstants>
50-
<DefineConstants>$(DefineConstants);NO_DEBUG_LOG</DefineConstants>
51-
<DefineConstants>$(DefineConstants);NO_INLINE_IL_PARSER</DefineConstants>
52-
<DefineConstants>$(DefineConstants);NO_LOADER_OPTIMIZATION</DefineConstants>
53-
<DefineConstants>$(DefineConstants);NO_LOGGING_GUI</DefineConstants>
54-
<DefineConstants>$(DefineConstants);RESHAPED_MSBUILD</DefineConstants>
49+
<DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
5550
<DefineConstants>$(DefineConstants);SIGNED</DefineConstants>
5651
<DefineConstants>$(DefineConstants);STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY</DefineConstants>
5752
<NoWarn>$(NoWarn);44;69;65;54;61;75;62;9;2003;</NoWarn>

‎mono/FSharp.Compiler/Makefile‎renamed to ‎mono/FSharp.Compiler.Private/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
NAME=FSharp.Compiler
1+
NAME=FSharp.Compiler.Private
22
ASSEMBLY =$(NAME).dll
33
TOKEN=$(SIGN_TOKEN)
44

‎mono/config.make.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ install-sdk-lib:
139139
echo "Signing $(outdir)$(ASSEMBLY) with Mono key"; \
140140
$(monobindir)/sn -q -R $(outdir)$(ASSEMBLY) $(topdir)mono/mono.snk; \
141141
fi
142-
@if test x-$(NAME) = x-FSharp.Compiler; then \
142+
@if test x-$(NAME) = x-FSharp.Compiler.Private; then \
143143
echo "Installing extra dependency System.Collections.Immutable.dll to $(DESTDIR)$(monodir)/fsharp/"; \
144144
$(INSTALL_LIB) $(outdir)System.Collections.Immutable.dll $(DESTDIR)$(monodir)/fsharp/; \
145145
echo "Installing extra dependency System.Reflection.Metadata.dll to $(DESTDIR)$(monodir)/fsharp/"; \

‎setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ComponentGroupId="Compiler_LangPack">
77
<ComponentRefId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" />
88
<ComponentRefId="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" />
9-
<ComponentRefId="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" />
9+
<ComponentRefId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)" />
1010
<ComponentRefId="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" />
1111
<ComponentRefId="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" />
1212
<ComponentRefId="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" />
@@ -21,8 +21,8 @@
2121
<FileId="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Build.resources.dll"KeyPath="yes" />
2222
</Component>
2323

24-
<ComponentId="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode), $(var.LocaleCode)))">
25-
<FileId="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.resources.dll"KeyPath="yes" />
24+
<ComponentId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode), $(var.LocaleCode)))">
25+
<FileId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.Private.resources.dll"KeyPath="yes" />
2626
</Component>
2727

2828
<ComponentId="Compiler_LangPack_fsc.exe_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_fsc.exe_$(var.LocaleCode), $(var.LocaleCode)))">

‎setup/FSharp.SDK/component-groups/Compiler_Redist.wxs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ComponentGroupId="Compiler_Redist">
77
<ComponentRefId="Compiler_Redist_FSharp.Core.dll" />
88
<ComponentRefId="Compiler_Redist_FSharp.Build.dll" />
9-
<ComponentRefId="Compiler_Redist_FSharp.Compiler.dll" />
9+
<ComponentRefId="Compiler_Redist_FSharp.Compiler.Private.dll" />
1010
<ComponentRefId="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" />
1111
<ComponentRefId="Compiler_Redist_FSharp.Data.TypeProviders.dll" />
1212
<ComponentRefId="Compiler_Redist_fsc.exe" />
@@ -65,9 +65,9 @@
6565
</File>
6666
</Component>
6767

68-
<ComponentId="Compiler_Redist_FSharp.Compiler.dll"Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.dll, $(var.LocaleCode)))">
69-
<FileId="Compiler_Redist_FSharp.Compiler.dll"Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.dll"KeyPath="yes">
70-
<NetFx:NativeImageId="Compiler_Redist_FSharp.Compiler.Native.dll"Priority="0"Dependencies="no"Platform="all"AssemblyApplication="Compiler_Redist_fsc.exe" />
68+
<ComponentId="Compiler_Redist_FSharp.Compiler.Private.dll"Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Private.dll, $(var.LocaleCode)))">
69+
<FileId="Compiler_Redist_FSharp.Compiler.Private.dll"Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Private.dll"KeyPath="yes">
70+
<NetFx:NativeImageId="Compiler_Redist_FSharp.Compiler.Private.Native.dll"Priority="0"Dependencies="no"Platform="all"AssemblyApplication="Compiler_Redist_fsc.exe" />
7171
</File>
7272
</Component>
7373

0 commit comments

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