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

Commit3d0ae5e

Browse files
authored
[WIP] simplify mono build (dotnet#4358)
* simplify mono build* remove dead files* remove build.sh in favour of make* remove build.sh in favour of make (doc)* remove build.sh in favour of make (doc)* simplify netci.groovy* cleanup
1 parent2180de4 commit3d0ae5e

18 files changed

+116
-1381
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
*.rtfdiff=astextplain
2222
*.RTFdiff=astextplain
2323

24-
autogen.shtexteol=lf
25-
launcher.intexteol=lf
26-
config.make.intexteol=lf
24+
mono/launchertexteol=lf
25+
mono/config.maketexteol=lf
2726
targets.maketexteol=lf
28-
configure.actexteol=lf
29-
Makefile.intexteol=lf
3027

3128
*.bsllinguist-vendored=true

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ Proto
8787
sign_temp
8888
.libs
8989
configure
90-
launcher
91-
autom4te.cache
9290
config.log
93-
mono/config.make
9491
config.status
9592
*~
9693
*.suo

‎DEVGUIDE.md‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,28 +70,47 @@ then building the solution will be enough.
7070

7171
For Linux/Mono, follow[these instructions](http://www.mono-project.com/docs/getting-started/install/linux/). Also you may need:
7272

73-
sudo apt-get install mono-completeautoconf libtool pkg-configmake git automake
73+
sudo apt-get install mono-complete make git
7474

7575
Then:
7676

77-
./autoconf.sh --prefix /usr
7877
make
79-
make install
8078

81-
Full testing is not yet enabled on Linux, nor is a .NET Core build of the compiler.
79+
Then to replace your machine-wide installation:
8280

83-
You can alternatively use
81+
sudo make install
8482

85-
./build.sh
83+
Full testing is not yet enabled on Linux, nor is a .NET Corebuild of the compiler.
8684

8785
###Developing the F# Compiler (macOS)
8886

89-
Install Xamarin Studio, then
87+
Install XCode command line tools (or homebrew equivalents) and Mono or Visual Studio for Mac.
88+
89+
Then:
9090

91-
./autogen.sh --prefix=/Library/Frameworks/Mono.framework/Versions/Current/
9291
make
92+
93+
Then to replace your machine-wide installation:
94+
9395
sudo make install
9496

97+
98+
###Developing the F# Compiler (Linux or macOS and .NET Core)
99+
100+
Install[the latest .NET SDK](https://www.microsoft.com/net/download/). Then use
101+
102+
src/buildfromsource.sh
103+
104+
Outputs are placed in
105+
106+
BuildFromSource/Debug/...
107+
BuildFromSource/Release/...
108+
109+
This uses an installed .NET SDK 2.0 to build the various duplicated project
110+
111+
Testing the .NET Core version of the F# compiler on mwcOS and Linux is TBD.
112+
113+
95114
###Developing the Visual F# IDE Tools (Windows Only)
96115

97116
To build and test Visual F# IDE Tools, install these requirements:

‎FSharp.sln‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B8DDA694
3939
EndProject
4040
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Libraries","Libraries","{3058BC79-8E79-4645-B05D-48CC182FA8A6}"
4141
EndProject
42-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="HostedCompilerServer","tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj","{4239EFEA-E746-446A-BF7A-51FCBAB13946}"
43-
EndProject
44-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ILComparer","tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj","{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
45-
EndProject
4642
Global
4743
GlobalSection(SolutionConfigurationPlatforms) =preSolution
4844
Debug|Any CPU=Debug|Any CPU
@@ -185,26 +181,6 @@ Global
185181
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.Build.0=Release|Any CPU
186182
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.ActiveCfg=Release|Any CPU
187183
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.Build.0=Release|Any CPU
188-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
189-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|Any CPU.Build.0=Debug|Any CPU
190-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|x86.ActiveCfg=Debug|Any CPU
191-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|x86.Build.0=Debug|Any CPU
192-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Proto|Any CPU.ActiveCfg=Release|Any CPU
193-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Proto|x86.ActiveCfg=Release|Any CPU
194-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Release|Any CPU.ActiveCfg=Release|Any CPU
195-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Release|Any CPU.Build.0=Release|Any CPU
196-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Release|x86.ActiveCfg=Release|Any CPU
197-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Release|x86.Build.0=Release|Any CPU
198-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
199-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Debug|Any CPU.Build.0=Debug|Any CPU
200-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Debug|x86.ActiveCfg=Debug|Any CPU
201-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Debug|x86.Build.0=Debug|Any CPU
202-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Proto|Any CPU.ActiveCfg=Release|Any CPU
203-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Proto|x86.ActiveCfg=Release|Any CPU
204-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.ActiveCfg=Release|Any CPU
205-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0=Release|Any CPU
206-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg=Release|Any CPU
207-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0=Release|Any CPU
208184
EndGlobalSection
209185
GlobalSection(SolutionProperties) =preSolution
210186
HideSolutionNode =FALSE
@@ -221,7 +197,5 @@ Global
221197
{C163E892-5BF7-4B59-AA99-B0E8079C67C4} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
222198
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
223199
{88E2D422-6852-46E3-A740-83E391DC7973} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
224-
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
225-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
226200
EndGlobalSection
227201
EndGlobal

‎Makefile‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
include$(topsrcdir)mono/config.make
22

3-
.PHONY: restore build
3+
.PHONY: restore build build-proto
44

55
restore:
66
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
7+
chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe
8+
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
9+
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
710

811
# Make the proto using the bootstrap, then make the final compiler using the proto
912
# We call MAKE sequentially because we don't want build-final to explicitly depend on build-proto,
1013
# as that causes a complete recompilation of both proto and final everytime you touch the
1114
# compiler sources.
1215
all:
16+
@echo -----------
17+
@echo prefix=$(prefix)
18+
@echo topdir=$(topdir)
19+
@echo monodir=$(monodir)
20+
@echo monolibdir=$(monolibdir)
21+
@echo monobindir=$(monobindir)
22+
@echo -----------
23+
$(MAKE) restore
1324
$(MAKE) build-proto
1425
$(MAKE) build
1526

16-
build-proto: restore
27+
build-proto:
1728
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
1829
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/Fsc-proto/Fsc-proto.fsproj
1930

‎autogen.sh‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎before_install.sh‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

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